December 2020 - Wine-commits

Dean M Greer : configure: Don't prepend folder name for SDL.h.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: e4fbae832c868e9fcf5a91c58255fe3f4ea1cb30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4fbae832c868e9fcf5a91c5… Author: Dean M Greer <gcenx83(a)gmail.com> Date: Wed Dec 2 21:31:15 2020 +0100 configure: Don't prepend folder name for SDL.h. This fixes pkgconfig SDL2 detection when SDL2 is installed in a non-standard location. Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 ++++---- configure.ac | 2 +- dlls/winebus.sys/bus_sdl.c | 4 ++-- include/config.h.in | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index d025c38934c..d8759253727 100755 --- a/configure +++ b/configure @@ -14966,12 +14966,12 @@ $as_echo "$as_me:${as_lineno-$LINENO}: sdl2 cflags: $SDL2_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: sdl2 libs: $SDL2_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $SDL2_CFLAGS" -for ac_header in SDL2/SDL.h +for ac_header in SDL.h do : - ac_fn_c_check_header_mongrel "$LINENO" "SDL2/SDL.h" "ac_cv_header_SDL2_SDL_h" "$ac_includes_default" -if test "x$ac_cv_header_SDL2_SDL_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "SDL.h" "ac_cv_header_SDL_h" "$ac_includes_default" +if test "x$ac_cv_header_SDL_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_SDL2_SDL_H 1 +#define HAVE_SDL_H 1 _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lSDL2" >&5 $as_echo_n "checking for -lSDL2... " >&6; } diff --git a/configure.ac b/configure.ac index e823543f1cd..168df52f791 100644 --- a/configure.ac +++ b/configure.ac @@ -1712,7 +1712,7 @@ dnl **** Check for libSDL2 **** if test "x$with_sdl" != "xno" then WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,, - [AC_CHECK_HEADERS([SDL2/SDL.h], + [AC_CHECK_HEADERS([SDL.h], [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])]) fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 19c6f23e071..fa691011fde 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -27,8 +27,8 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_SDL2_SDL_H -# include <SDL2/SDL.h> +#ifdef HAVE_SDL_H +# include <SDL.h> #endif #define NONAMELESSUNION diff --git a/include/config.h.in b/include/config.h.in index c0d90c48677..c131f8f22bc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -738,8 +738,8 @@ /* Define to 1 if you have the <scsi/sg.h> header file. */ #undef HAVE_SCSI_SG_H -/* Define to 1 if you have the <SDL2/SDL.h> header file. */ -#undef HAVE_SDL2_SDL_H +/* Define to 1 if you have the <SDL.h> header file. */ +#undef HAVE_SDL_H /* Define to 1 if you have the <Security/Security.h> header file. */ #undef HAVE_SECURITY_SECURITY_H

1 0

Nikolay Sivov : dwrite: Remove explicit lookup type check in GetVerticalGlyphVariants().
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 87260918361501fd10bbf11c927751d1a34a693b URL: https://source.winehq.org/git/wine.git/?a=commit;h=87260918361501fd10bbf11c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:02 2020 +0300 dwrite: Remove explicit lookup type check in GetVerticalGlyphVariants(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1cf47e5ac69..260a0a8f5db 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6150,10 +6150,6 @@ HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, u { const struct lookup *lookup = &lookups.lookups[i]; - /* FIXME: should probably handle extension subtables. */ - if (lookup->type != GSUB_LOOKUP_SINGLE_SUBST) - continue; - context.cur = 0; while (context.cur < context.glyph_count) {

1 0

Nikolay Sivov : dwrite: Use consistent trace format for strings object.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 3112144223b8bddf0aea9cab0107f4d7441c6f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3112144223b8bddf0aea9cab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:03 2020 +0300 dwrite: Use consistent trace format for strings object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a96874b2c2c..cfb2e9f6a56 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -258,9 +258,7 @@ static inline struct localizedstrings *impl_from_IDWriteLocalizedStrings(IDWrite static HRESULT WINAPI localizedstrings_QueryInterface(IDWriteLocalizedStrings *iface, REFIID riid, void **obj) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteLocalizedStrings)) { @@ -358,60 +356,66 @@ static HRESULT WINAPI localizedstrings_GetLocaleNameLength(IDWriteLocalizedStrin static HRESULT WINAPI localizedstrings_GetLocaleName(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + TRACE("%p, %u, %p, %u.\n", iface, index, buffer, size); - if (index >= This->count) { + if (index >= strings->count) + { if (buffer) *buffer = 0; return E_FAIL; } - if (size < strlenW(This->data[index].locale)+1) { + if (size < strlenW(strings->data[index].locale) + 1) + { if (buffer) *buffer = 0; return E_NOT_SUFFICIENT_BUFFER; } - strcpyW(buffer, This->data[index].locale); + strcpyW(buffer, strings->data[index].locale); return S_OK; } static HRESULT WINAPI localizedstrings_GetStringLength(IDWriteLocalizedStrings *iface, UINT32 index, UINT32 *length) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p)\n", This, index, length); + TRACE("%p, %u, %p.\n", iface, index, length); - if (index >= This->count) { - *length = (UINT32)-1; + if (index >= strings->count) + { + *length = ~0u; return E_FAIL; } - *length = strlenW(This->data[index].string); + *length = strlenW(strings->data[index].string); return S_OK; } static HRESULT WINAPI localizedstrings_GetString(IDWriteLocalizedStrings *iface, UINT32 index, WCHAR *buffer, UINT32 size) { - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); - TRACE("(%p)->(%u %p %u)\n", This, index, buffer, size); + TRACE("%p, %u, %p, %u.\n", iface, index, buffer, size); - if (index >= This->count) { + if (index >= strings->count) + { if (buffer) *buffer = 0; return E_FAIL; } - if (size < strlenW(This->data[index].string)+1) { + if (size < strlenW(strings->data[index].string) + 1) + { if (buffer) *buffer = 0; return E_NOT_SUFFICIENT_BUFFER; } - strcpyW(buffer, This->data[index].string); + strcpyW(buffer, strings->data[index].string); return S_OK; } -static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = { +static const IDWriteLocalizedStringsVtbl localizedstringsvtbl = +{ localizedstrings_QueryInterface, localizedstrings_AddRef, localizedstrings_Release, @@ -511,13 +515,15 @@ HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedS void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) { static const WCHAR enusW[] = {'e','n','-','U','S',0}; - struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); UINT32 i; - for (i = 0; i < This->count; i++) { - if (!strcmpiW(This->data[i].locale, enusW)) { - heap_free(This->data[i].string); - This->data[i].string = heap_strdupW(string); + for (i = 0; i < strings->count; i++) + { + if (!strcmpiW(strings->data[i].locale, enusW)) + { + heap_free(strings->data[i].string); + strings->data[i].string = heap_strdupW(string); break; } }

1 0

Nikolay Sivov : dwrite: Use consistent trace format for rendering parameters object.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 87d6e45514228cf9704b54f97ac951cb7baa4851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87d6e45514228cf9704b54f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:04 2020 +0300 dwrite: Use consistent trace format for rendering parameters object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 140 +++++++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 62 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index cfb2e9f6a56..dd9bd4dc6a3 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -54,14 +54,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return TRUE; } -struct renderingparams { +struct renderingparams +{ IDWriteRenderingParams3 IDWriteRenderingParams3_iface; - LONG ref; + LONG refcount; - FLOAT gamma; - FLOAT contrast; - FLOAT grayscalecontrast; - FLOAT cleartype_level; + float gamma; + float contrast; + float grayscalecontrast; + float cleartype_level; DWRITE_PIXEL_GEOMETRY geometry; DWRITE_RENDERING_MODE1 mode; DWRITE_GRID_FIT_MODE gridfit; @@ -74,9 +75,7 @@ static inline struct renderingparams *impl_from_IDWriteRenderingParams3(IDWriteR static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *iface, REFIID riid, void **obj) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteRenderingParams3) || IsEqualIID(riid, &IID_IDWriteRenderingParams2) || @@ -96,51 +95,61 @@ static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams3 *if static ULONG WINAPI renderingparams_AddRef(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + ULONG refcount = InterlockedIncrement(&params->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + ULONG refcount = InterlockedDecrement(&params->refcount); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) - heap_free(This); + if (!refcount) + heap_free(params); - return ref; + return refcount; } -static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams_GetGamma(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->gamma; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->gamma; } -static FLOAT WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->contrast; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->contrast; } -static FLOAT WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->cleartype_level; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->cleartype_level; } static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->geometry; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->geometry; } static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mode) @@ -161,35 +170,42 @@ static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mo static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); - return rendering_mode_from_mode1(This->mode); + return rendering_mode_from_mode1(params->mode); } -static FLOAT WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface) +static float WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->grayscalecontrast; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->grayscalecontrast; } static DWRITE_GRID_FIT_MODE WINAPI renderingparams2_GetGridFitMode(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->gridfit; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->gridfit; } static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteRenderingParams3 *iface) { - struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); - TRACE("(%p)\n", This); - return This->mode; + struct renderingparams *params = impl_from_IDWriteRenderingParams3(iface); + + TRACE("%p.\n", iface); + + return params->mode; } -static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = { +static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = +{ renderingparams_QueryInterface, renderingparams_AddRef, renderingparams_Release, @@ -203,11 +219,11 @@ static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = { renderingparams3_GetRenderingMode1 }; -static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT grayscalecontrast, FLOAT cleartype_level, +static HRESULT create_renderingparams(float gamma, float contrast, float grayscalecontrast, float cleartype_level, DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE1 mode, DWRITE_GRID_FIT_MODE gridfit, IDWriteRenderingParams3 **params) { - struct renderingparams *This; + struct renderingparams *object; *params = NULL; @@ -217,21 +233,21 @@ static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT graysca if ((UINT32)gridfit > DWRITE_GRID_FIT_MODE_ENABLED || (UINT32)geometry > DWRITE_PIXEL_GEOMETRY_BGR) return E_INVALIDARG; - This = heap_alloc(sizeof(struct renderingparams)); - if (!This) return E_OUTOFMEMORY; + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; - This->IDWriteRenderingParams3_iface.lpVtbl = &renderingparamsvtbl; - This->ref = 1; + object->IDWriteRenderingParams3_iface.lpVtbl = &renderingparamsvtbl; + object->refcount = 1; - This->gamma = gamma; - This->contrast = contrast; - This->grayscalecontrast = grayscalecontrast; - This->cleartype_level = cleartype_level; - This->geometry = geometry; - This->mode = mode; - This->gridfit = gridfit; + object->gamma = gamma; + object->contrast = contrast; + object->grayscalecontrast = grayscalecontrast; + object->cleartype_level = cleartype_level; + object->geometry = geometry; + object->mode = mode; + object->gridfit = gridfit; - *params = &This->IDWriteRenderingParams3_iface; + *params = &object->IDWriteRenderingParams3_iface; return S_OK; }

1 0

Nikolay Sivov : dwrite: Use consistent trace format for font data access objects.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 62b6b9a9529bed64f080e58f0564ac8be751d360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62b6b9a9529bed64f080e58f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:05 2020 +0300 dwrite: Use consistent trace format for font data access objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 225 +++++++++++++++++++++++++---------------------- dlls/dwrite/gdiinterop.c | 74 +++++++--------- 2 files changed, 151 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62b6b9a9529bed64f080…

1 0

Nikolay Sivov : dwrite: Use consistent trace format for rendering object.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 24508594ba21a148ff52a30e5969ec431200b500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24508594ba21a148ff52a30e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:06 2020 +0300 dwrite: Use consistent trace format for rendering object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 88 +++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2d764eca7c0..c10234e09fc 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -167,9 +167,10 @@ enum runanalysis_flags { RUNANALYSIS_USE_TRANSFORM = 1 << 2 }; -struct dwrite_glyphrunanalysis { +struct dwrite_glyphrunanalysis +{ IDWriteGlyphRunAnalysis IDWriteGlyphRunAnalysis_iface; - LONG ref; + LONG refcount; DWRITE_RENDERING_MODE1 rendering_mode; DWRITE_TEXTURE_TYPE texture_type; /* derived from rendering mode specified on creation */ @@ -5496,12 +5497,9 @@ HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **ke return S_OK; } -/* IDWriteGlyphRunAnalysis */ static HRESULT WINAPI glyphrunanalysis_QueryInterface(IDWriteGlyphRunAnalysis *iface, REFIID riid, void **ppv) { - struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(riid, &IID_IDWriteGlyphRunAnalysis) || IsEqualIID(riid, &IID_IUnknown)) @@ -5519,29 +5517,32 @@ static HRESULT WINAPI glyphrunanalysis_QueryInterface(IDWriteGlyphRunAnalysis *i static ULONG WINAPI glyphrunanalysis_AddRef(IDWriteGlyphRunAnalysis *iface) { - struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); - return ref; + struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); + ULONG refcount = InterlockedIncrement(&analysis->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface) { - struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); + ULONG refcount = InterlockedDecrement(&analysis->refcount); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) { - if (This->run.fontFace) - IDWriteFontFace_Release(This->run.fontFace); - heap_free(This->glyphs); - heap_free(This->origins); - heap_free(This->bitmap); - heap_free(This); + if (!refcount) + { + if (analysis->run.fontFace) + IDWriteFontFace_Release(analysis->run.fontFace); + heap_free(analysis->glyphs); + heap_free(analysis->origins); + heap_free(analysis->bitmap); + heap_free(analysis); } - return ref; + return refcount; } static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) @@ -5611,23 +5612,25 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a *bounds = analysis->bounds; } -static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type, RECT *bounds) +static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnalysis *iface, + DWRITE_TEXTURE_TYPE type, RECT *bounds) { - struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); - TRACE("(%p)->(%d %p)\n", This, type, bounds); + TRACE("%p, %d, %p.\n", iface, type, bounds); if ((UINT32)type > DWRITE_TEXTURE_CLEARTYPE_3x1) { SetRectEmpty(bounds); return E_INVALIDARG; } - if (type != This->texture_type) { + if (type != analysis->texture_type) + { SetRectEmpty(bounds); return S_OK; } - glyphrunanalysis_get_texturebounds(This, bounds); + glyphrunanalysis_get_texturebounds(analysis, bounds); return S_OK; } @@ -5769,45 +5772,47 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysis *iface, DWRITE_TEXTURE_TYPE type, RECT const *bounds, BYTE *bitmap, UINT32 size) { - struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); UINT32 required; RECT runbounds; - TRACE("(%p)->(%d %s %p %u)\n", This, type, wine_dbgstr_rect(bounds), bitmap, size); + TRACE("%p, %d, %s, %p, %u.\n", iface, type, wine_dbgstr_rect(bounds), bitmap, size); if (!bounds || !bitmap || (UINT32)type > DWRITE_TEXTURE_CLEARTYPE_3x1) return E_INVALIDARG; /* make sure buffer is large enough for requested texture type */ required = (bounds->right - bounds->left) * (bounds->bottom - bounds->top); - if (This->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) + if (analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) required *= 3; if (size < required) return E_NOT_SUFFICIENT_BUFFER; /* validate requested texture type */ - if (This->texture_type != type) + if (analysis->texture_type != type) return DWRITE_E_UNSUPPORTEDOPERATION; memset(bitmap, 0, size); - glyphrunanalysis_get_texturebounds(This, &runbounds); - if (IntersectRect(&runbounds, &runbounds, bounds)) { + glyphrunanalysis_get_texturebounds(analysis, &runbounds); + if (IntersectRect(&runbounds, &runbounds, bounds)) + { int pixel_size = type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? 3 : 1; - int src_width = (This->bounds.right - This->bounds.left) * pixel_size; + int src_width = (analysis->bounds.right - analysis->bounds.left) * pixel_size; int dst_width = (bounds->right - bounds->left) * pixel_size; int draw_width = (runbounds.right - runbounds.left) * pixel_size; BYTE *src, *dst; int y; - if (!(This->flags & RUNANALYSIS_BITMAP_READY)) { + if (!(analysis->flags & RUNANALYSIS_BITMAP_READY)) + { HRESULT hr; - if (FAILED(hr = glyphrunanalysis_render(This))) + if (FAILED(hr = glyphrunanalysis_render(analysis))) return hr; } - src = get_pixel_ptr(This->bitmap, type, &runbounds, &This->bounds); + src = get_pixel_ptr(analysis->bitmap, type, &runbounds, &analysis->bounds); dst = get_pixel_ptr(bitmap, type, &runbounds, bounds); for (y = 0; y < runbounds.bottom - runbounds.top; y++) { @@ -5823,14 +5828,14 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalysis *iface, IDWriteRenderingParams *params, FLOAT *gamma, FLOAT *contrast, FLOAT *cleartypelevel) { - struct dwrite_glyphrunanalysis *This = impl_from_IDWriteGlyphRunAnalysis(iface); + struct dwrite_glyphrunanalysis *analysis = impl_from_IDWriteGlyphRunAnalysis(iface); - TRACE("(%p)->(%p %p %p %p)\n", This, params, gamma, contrast, cleartypelevel); + TRACE("%p, %p, %p, %p, %p.\n", iface, params, gamma, contrast, cleartypelevel); if (!params) return E_INVALIDARG; - switch (This->rendering_mode) + switch (analysis->rendering_mode) { case DWRITE_RENDERING_MODE1_GDI_CLASSIC: case DWRITE_RENDERING_MODE1_GDI_NATURAL: @@ -5859,7 +5864,8 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys return S_OK; } -static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { +static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = +{ glyphrunanalysis_QueryInterface, glyphrunanalysis_AddRef, glyphrunanalysis_Release, @@ -5930,7 +5936,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit return E_OUTOFMEMORY; analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; - analysis->ref = 1; + analysis->refcount = 1; analysis->rendering_mode = desc->rendering_mode; if (desc->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED

1 0

Francois Gouget : fsutils/tests: Fsutils requires elevated privileges on Windows <= 7.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: fe719e16a4d3a8fbaebd8c6ed6919a4af63cde3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe719e16a4d3a8fbaebd8c6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 2 06:34:04 2020 +0100 fsutils/tests: Fsutils requires elevated privileges on Windows <= 7. So skip the tests if the first fsutils run fails and we don't have elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/tests/Makefile.in | 2 +- programs/fsutil/tests/fsutil.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/programs/fsutil/tests/Makefile.in b/programs/fsutil/tests/Makefile.in index 5a69e47dc61..f0490b3b660 100644 --- a/programs/fsutil/tests/Makefile.in +++ b/programs/fsutil/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = fsutil.exe -IMPORTS = user32 +IMPORTS = advapi32 user32 C_SRCS = \ fsutil.c diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 1111b5b2fed..eff47a4f8ec 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -21,6 +21,22 @@ #include "wine/test.h" +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + static DWORD runcmd(const char* cmd) { STARTUPINFOA si = { sizeof(STARTUPINFOA) }; @@ -64,6 +80,11 @@ static void test_hardlink(void) CloseHandle(hfile); rc = runcmd("fsutil"); + if (rc == 1 && !is_process_elevated()) + { + win_skip("Cannot run fsutil without elevated privileges on Windows <= 7\n"); + return; + } ok(rc == 0, "failed to run fsutil\n"); rc = runcmd("fsutil hardlink");

1 0

Gabriel Ivăncescu : conhost: Respect the StartupInfo's wShowWindow.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 7b2b4e0329371ad6efd5ded735ea0ada92b8bf49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2b4e0329371ad6efd5ded7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 1 15:49:53 2020 +0200 conhost: Respect the StartupInfo's wShowWindow. Since 859b526c81a2af841b5b7b28d06f3d782bccdab5, console windows are always shown even if they're supposed to start in some other state, e.g. minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index e3a9a25eac3..f864bbb5a1c 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2756,7 +2756,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!init_window( &console )) return 1; GetStartupInfoW( &si ); set_console_title( &console, si.lpTitle, wcslen( si.lpTitle ) * sizeof(WCHAR) ); - ShowWindow( console.win, SW_SHOW ); + ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW ); } return main_loop( &console, signal );

1 0

Matteo Bruni : wined3d: Get rid of an unnecessary assignment.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 4adfe31003b3be0fb97b865df76409e575655f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4adfe31003b3be0fb97b865d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 1 19:11:27 2020 +0100 wined3d: Get rid of an unnecessary assignment. 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/wined3d/view.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4db3746d8de..1abbbac4fb4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1409,7 +1409,6 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) struct wined3d_context_gl *context_gl; context_gl = wined3d_context_gl(context_acquire(resource->device, NULL, 0)); - gl_info = context_gl->gl_info; create_buffer_view(&view_gl->gl_view, &context_gl->c, desc, buffer, view_gl->v.format); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) {

1 0

Matteo Bruni : d3d9/tests: Make a variable static const.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 1b439c1def3f559b163444198755654d648922b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b439c1def3f559b16344419… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 1 19:11:28 2020 +0100 d3d9/tests: Make a variable static const. 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/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7c0a0157389..504d276d6c5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16799,7 +16799,7 @@ static void fp_special_test(void) 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s;

1 0