December 2020 - Wine-Commits

Dean M Greer : configure: Don't prepend folder name for SDL.h.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

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

Henri Verbeet : wined3d: Reference the SRV bo in context_load_shader_resources().
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: e29877ee42688f155deb9bd09700b853345f3a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29877ee42688f155deb9bd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 20:17:58 2020 +0330 wined3d: Reference the SRV bo in context_load_shader_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 37 -------------------------------- dlls/wined3d/context_gl.c | 48 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ddff9f1e014..118ac2aad8a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -383,40 +383,3 @@ void context_preload_textures(struct wined3d_context *context, const struct wine } } } - -void context_load_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int shader_mask) -{ - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; - unsigned int i, j; - - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader_mask & (1u << i))) - continue; - - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], context, state); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - wined3d_buffer_load(buffer_from_resource(view->resource), context, state); - else - wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); - } - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9faff43f003..beb418ba960 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,50 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_shader_resources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, unsigned int shader_mask) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_buffer_gl *buffer_gl; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader_mask & (1u << i))) + continue; + + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_buffer_load(state->cb[i][j], &context_gl->c, state); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + else + { + wined3d_texture_load(texture_from_resource(view->resource), &context_gl->c, FALSE); + } + } + } +} + static void context_gl_load_unordered_access_resources(struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { @@ -3768,7 +3812,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, * updating a resource location. */ wined3d_context_gl_update_tex_unit_map(context_gl, state); context_preload_textures(context, state); - context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + context_gl_load_shader_resources(context_gl, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); context_gl_load_stream_output_buffers(context_gl, state); @@ -3873,7 +3917,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int state_id, i; - context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_gl_load_shader_resources(context_gl, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 95abd2217a0..b756c80ad8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2149,8 +2149,6 @@ struct wined3d_context void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -void context_load_shader_resources(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Jacek Caban : kernel32: Remove no longer used variables.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 90911216699ccbf11848af79b2f7ecb206d9d289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90911216699ccbf11848af79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 17:43:42 2020 +0100 kernel32: Remove no longer used variables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/kernel_private.h | 4 ---- dlls/kernel32/path.c | 8 +++++--- dlls/kernel32/process.c | 4 ---- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index e312a202db6..89394e16430 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -120,7 +120,6 @@ static void copy_startup_info(void) */ static BOOL process_attach( HMODULE module ) { - kernel32_handle = module; RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 7602c3b00c4..633511d6140 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -29,12 +29,8 @@ static inline BOOL set_ntstatus( NTSTATUS status ) return !status; } -extern HMODULE kernel32_handle DECLSPEC_HIDDEN; extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; -extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; -extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; - extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 8b4158b29d6..023dff826d6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 +static const WCHAR system_dir[] = L"C:\\windows\\system32"; + /*********************************************************************** * copy_filename_WtoA * @@ -232,10 +234,10 @@ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBU */ UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count ) { - UINT len = lstrlenW( DIR_System ) + 1; + UINT len = ARRAY_SIZE(system_dir); if (path && count >= len) { - lstrcpyW( path, DIR_System ); + lstrcpyW( path, system_dir ); len--; } return len; @@ -249,7 +251,7 @@ UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count ) */ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) { - return copy_filename_WtoA( DIR_System, path, count ); + return copy_filename_WtoA( system_dir, path, count ); } diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c2df0ccd658..92582ae31de 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -49,12 +49,8 @@ typedef struct DWORD dwReserved; } LOADPARMS32; -HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; -const WCHAR DIR_Windows[] = L"C:\\windows"; -const WCHAR DIR_System[] = L"C:\\windows\\system32"; - /* Process flags */ #define PDB32_DEBUGGED 0x0001 /* Process is being debugged */ #define PDB32_WIN16_PROC 0x0008 /* Win16 process */

1 0

Matteo Bruni : d3d11: Don't explicitly check for cube map support.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 54d4c905ba96c8610c968d66acee8d04784a91ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d4c905ba96c8610c968d66… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 1 19:11:29 2020 +0100 d3d11: Don't explicitly check for cube map support. 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/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2a08d2b1e65..50e8cd58fe2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3315,7 +3315,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, @@ -3364,6 +3363,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; + *format_support |= D3D11_FORMAT_SUPPORT_TEXTURECUBE; if (feature_level >= D3D_FEATURE_LEVEL_10_1) *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER;

1 0

Matteo Bruni : wined3d: Get rid of an unnecessary assignment.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

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

Nikolay Sivov : dwrite: Use consistent trace format for rendering object.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

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

Nikolay Sivov : dwrite: Use consistent trace format for font data access objects.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

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: Remove explicit lookup type check in GetVerticalGlyphVariants().
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

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

Jacek Caban : kernel32: Remove outdated comments.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: e710aa081f8a98a288478551f203398422ec16fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e710aa081f8a98a288478551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 17:43:49 2020 +0100 kernel32: Remove outdated comments. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f2aa3fa6dd4..7b3a07f0de5 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -266,7 +266,6 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3) { FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); @@ -275,7 +274,6 @@ DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unk } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3) { FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); @@ -284,7 +282,6 @@ DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unk } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryLengthA(LPCSTR unknown) { FIXME(": (%s) stub!\n", debugstr_a(unknown)); @@ -293,7 +290,6 @@ DWORD WINAPI GetConsoleCommandHistoryLengthA(LPCSTR unknown) } /* Undocumented, called by native doskey.exe */ -/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ DWORD WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR unknown) { FIXME(": (%s) stub!\n", debugstr_w(unknown));

1 0

Jacek Caban : server: Fix handling of STATUS_ALERTED in get_next_console_request.
by Alexandre Julliard Dec. 2, 2020

Dec. 2, 2020

Module: wine Branch: master Commit: 574ced0dc6f019d11c7c0c67d4b655985b1c24e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574ced0dc6f019d11c7c0c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 2 20:06:11 2020 +0100 server: Fix handling of STATUS_ALERTED in get_next_console_request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 14 ++++++++++++++ server/console.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index cab036243dc..918ecac8ac4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -268,6 +268,8 @@ static void testWriteSimple(HANDLE hCon) const char* mytest = "abcdefg"; int mylen = strlen(mytest); COORD c = {0, 0}; + DWORD len; + BOOL ret; simple_write_console(hCon, mytest); @@ -278,6 +280,18 @@ static void testWriteSimple(HANDLE hCon) okCURSOR(hCon, c); okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); + + ret = WriteFile(hCon, mytest, mylen, &len, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + ok(len == mylen, "unexpected len = %u\n", len); + + for (c.X = 0; c.X < 2 * mylen; c.X++) + { + okCHAR(hCon, c, mytest[c.X % mylen], TEST_ATTRIB); + } + + okCURSOR(hCon, c); + okCHAR(hCon, c, ' ', DEFAULT_ATTRIB); } static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) diff --git a/server/console.c b/server/console.c index dc3785e8726..d1f948b23a6 100644 --- a/server/console.c +++ b/server/console.c @@ -1520,7 +1520,6 @@ DECL_HANDLER(get_next_console_request) if ((iosb->out_data = memdup( get_req_data(), iosb->out_size ))) { iosb->result = iosb->out_size; - status = STATUS_ALERTED; } else if (!status) { @@ -1528,6 +1527,7 @@ DECL_HANDLER(get_next_console_request) iosb->out_size = 0; } } + if (iosb->result) status = STATUS_ALERTED; } else {

1 0