- Wine-Devel - list.winehq.org

[PATCH] wined3d: Make wined3d_context_vk_allocate_memory() static.
by Francois Gouget Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8df416851f2..705f789ed5f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -306,7 +306,7 @@ VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_cont return vk_memory; } -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, +static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e9f3884724..86c053df0db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2611,8 +2611,6 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte void wined3d_context_vk_accumulate_pending_queries(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_add_pending_query(struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) DECLSPEC_HIDDEN; -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, - unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, -- 2.30.2

2 1

[PATCH] windowscodecs: Make the png_{de,en}coder_*() functions static.
by Francois Gouget Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/libpng.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 0571f5a2aad..6496fa36436 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -203,7 +203,7 @@ static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t lengt } } -HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; @@ -484,14 +484,14 @@ end: return hr; } -HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct png_decoder *This = impl_from_decoder(iface); *info = This->decoder_frame; return S_OK; } -HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, +static HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct png_decoder *This = impl_from_decoder(iface); @@ -501,7 +501,7 @@ HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, prc, stride, buffersize, buffer); } -HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, +static HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { struct png_decoder *This = impl_from_decoder(iface); @@ -574,7 +574,7 @@ end: return hr; } -HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, +static HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct png_decoder *This = impl_from_decoder(iface); @@ -590,7 +590,7 @@ HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL png_decoder_destroy(struct decoder* iface) +static void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -738,7 +738,7 @@ static HRESULT CDECL png_encoder_initialize(struct encoder *encoder, IStream *st return S_OK; } -HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) +static HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -869,7 +869,7 @@ static HRESULT CDECL png_encoder_create_frame(struct encoder *encoder, const str return S_OK; } -HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) +static HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) { struct png_encoder *This = impl_from_encoder(encoder); jmp_buf jmpbuf; -- 2.30.2

2 1

[PATCH 0/3] Let 64bit dbghelp handle a 32bit target
by Eric Pouech Sept. 1, 2021

Sept. 1, 2021

Allow 64bit dbghelp handle a 32bit target on WOW64 context The good news is that the serie is rather small. Improvements on last patch are welcomed :-( A+ --- Eric Pouech (3): dbghelp: split storage of PE header dbghelp: now storing the IMAGE_OPTIONAL_HEADER in either 32bit or 64bit form dbghelp: fix failing SymInitialize for a live 32bit target from a 64bit caller in WOW64 dlls/dbghelp/dbghelp.c | 58 +++++++++++++++++++++++++++++++++--- dlls/dbghelp/image_private.h | 6 +++- dlls/dbghelp/pe_module.c | 37 ++++++++++++++++------- 3 files changed, 86 insertions(+), 15 deletions(-)

5 10

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Write SM4 multiplication instructions.
by Zebediah Figura Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 32a4eda1..af1660f1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -957,6 +957,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_OP2_MUL: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.33.0

7 26

[PATCH v2 1/5] winemac.drv: Enable layer-backed views.
by Chip Davis Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d5434b8a966..bc06a9506ee 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -311,6 +311,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end +#ifndef MAC_OS_X_VERSION_10_14 +(a)protocol NSViewLayerContentScaleDelegate <NSObject> +(a)optional + + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window; + +(a)end +#endif + + @interface WineBaseView : NSView @end @@ -327,7 +337,7 @@ - (id) initWithFrame:(NSRect)frame device:(id<MTLDevice>)device; #endif -(a)interface WineContentView : WineBaseView <NSTextInputClient> +(a)interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -339,6 +349,7 @@ @interface WineContentView : WineBaseView <NSTextInputClient> NSMutableAttributedString* markedText; NSRange markedTextSelection; + BOOL _retinaMode; int backingSize[2]; #ifdef HAVE_METAL_METAL_H @@ -688,9 +699,15 @@ - (void) setRetinaMode:(int)mode [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; + _retinaMode = !!mode; [super setRetinaMode:mode]; } + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window + { + return (_retinaMode || newScale == 1.0); + } + - (void) viewDidHide { [super viewDidHide]; @@ -1002,6 +1019,7 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; if (!contentView) return nil; + [contentView setWantsLayer:YES]; [contentView setAutoresizesSubviews:NO]; /* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES @@ -3576,6 +3594,7 @@ macdrv_view macdrv_create_view(CGRect rect) NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; + [view setWantsLayer:YES]; [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; -- 2.33.0

2 5

[PATCH v2 1/2] jscript: Allow ES5 keywords in identifiers.
by Gabriel Ivăncescu Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- So, I managed to solve all the extra shift/reduce conflicts, but I'm not entirely happy about how I've done it, and I can't for the life of me figure out WHY, so I'm hoping by sending it some review might help me out of this situation. I tried bison with --report=all and verbose, and I don't know how to solve that conflict. The problem is in LabelledStatement; for some reason I cannot comprehend, I had to duplicate all the ES5 keywords and use tIdentifier as separate rules to avoid any extra shift/reduce conflicts from it. Using just "Identifier" would generate two extra shift/reduce conflicts! Using "tIdentifier | ES5Keyword" would generate only one extra shift/reduce conflict. And using "tIdentifier | kGET | kSET | kLET" generates no extra conflicts (this patch). I think I'm going crazy; isn't it supposed to be the same thing? Why the difference? Any ideas? dlls/jscript/parser.y | 44 ++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0ebdc2b..34ad532 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -220,7 +220,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t %type <expr> MemberExpression %type <expr> PrimaryExpression %type <expr> GetterSetterMethod -%type <identifier> Identifier_opt +%type <identifier> Identifier Identifier_opt %type <variable_list> VariableDeclarationList %type <variable_list> VariableDeclarationListNoIn %type <variable_declaration> VariableDeclaration @@ -240,10 +240,11 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t %type <literal> PropertyName %type <literal> BooleanLiteral %type <ival> AssignOper -%type <identifier> IdentifierName ReservedAsIdentifier +%type <identifier> IdentifierName ReservedAsIdentifier ES5Keyword %nonassoc LOWER_THAN_ELSE -%nonassoc kELSE +%nonassoc kELSE kIN kINSTANCEOF ':' +%nonassoc kGET kLET kSET %% @@ -267,9 +268,9 @@ FunctionStatementList FunctionExpression : kFUNCTION left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, ctx->begin + @1, @7 - @1 + 1); } - | kFUNCTION tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + | kFUNCTION Identifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, NULL, ctx->begin + @1, @8 - @1 + 1); } - | kFUNCTION tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + | kFUNCTION Identifier kDCOL Identifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $4, $6, $9, $2, ctx->begin + @1, @10 - @1 + 1); } /* ECMA-262 10th Edition 14.1 */ @@ -278,8 +279,8 @@ FunctionBody /* ECMA-262 3rd Edition 13 */ FormalParameterList - : tIdentifier { $$ = new_parameter_list(ctx, $1); } - | FormalParameterList ',' tIdentifier + : Identifier { $$ = new_parameter_list(ctx, $1); } + | FormalParameterList ',' Identifier { $$ = parameter_list_add(ctx, $1, $3); } /* ECMA-262 3rd Edition 13 */ @@ -380,12 +381,12 @@ VariableDeclarationListNoIn /* ECMA-262 3rd Edition 12.2 */ VariableDeclaration - : tIdentifier Initialiser_opt + : Identifier Initialiser_opt { $$ = new_variable_declaration(ctx, $1, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationNoIn - : tIdentifier InitialiserNoIn_opt + : Identifier InitialiserNoIn_opt { $$ = new_variable_declaration(ctx, $1, $2); } /* ECMA-262 3rd Edition 12.2 */ @@ -478,6 +479,12 @@ WithStatement LabelledStatement : tIdentifier ':' Statement { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kGET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kSET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kLET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } /* ECMA-262 3rd Edition 12.11 */ SwitchStatement @@ -526,7 +533,7 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH left_bracket tIdentifier right_bracket Block + : kCATCH left_bracket Identifier right_bracket Block { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ @@ -785,7 +792,7 @@ ArgumentList /* ECMA-262 3rd Edition 11.1 */ PrimaryExpression : kTHIS { $$ = new_expression(ctx, EXPR_THIS, 0); } - | tIdentifier { $$ = new_identifier_expression(ctx, $1); } + | Identifier { $$ = new_identifier_expression(ctx, $1); } | Literal { $$ = new_literal_expression(ctx, $1); } | ArrayLiteral { $$ = $1; } | ObjectLiteral { $$ = $1; } @@ -859,7 +866,11 @@ PropertyName /* ECMA-262 3rd Edition 7.6 */ Identifier_opt : /* empty*/ { $$ = NULL; } - | tIdentifier { $$ = $1; } + | Identifier { $$ = $1; } + +Identifier + : tIdentifier { $$ = $1; } + | ES5Keyword { $$ = $1; } /* ECMA-262 5.1 Edition 7.6 */ IdentifierName @@ -889,15 +900,12 @@ ReservedAsIdentifier | kFINALLY { $$ = $1; } | kFOR { $$ = $1; } | kFUNCTION { $$ = $1; } - | kGET { $$ = $1; } | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } - | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } - | kSET { $$ = $1; } | kSWITCH { $$ = $1; } | kTHIS { $$ = $1; } | kTHROW { $$ = $1; } @@ -908,6 +916,12 @@ ReservedAsIdentifier | kVOID { $$ = $1; } | kWHILE { $$ = $1; } | kWITH { $$ = $1; } + | ES5Keyword { $$ = $1; } + +ES5Keyword + : kGET { $$ = $1; } + | kLET { $$ = $1; } + | kSET { $$ = $1; } /* ECMA-262 3rd Edition 7.8 */ Literal -- 2.31.1

2 2

[PATCH 0/5] winemac.drv: Layer-backed views
by Chip Davis Sept. 1, 2021

Sept. 1, 2021

3 10

[PATCH 6/6] gdi32: Move CombineTransform to objects.c.
by Jacek Caban Sept. 1, 2021

Sept. 1, 2021

And use a separated copy in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dc.c | 52 +------------------------------------- dlls/gdi32/mapping.c | 22 ++++++++++++++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 24 ++++++++++++++++++ 5 files changed, 48 insertions(+), 54 deletions(-)

2 1

[PATCH 5/6] gdi32: Copy TranslateCharsetInfo to text.c.
by Jacek Caban Sept. 1, 2021

Sept. 1, 2021

And use a separated copy in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 96 ++++++++++++++++---------------------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/text.c | 82 ++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 58 deletions(-)

2 1

[PATCH 4/6] gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW.
by Jacek Caban Sept. 1, 2021

Sept. 1, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 10 ++++++---- dlls/gdi32/text.c | 16 ++++++++++++++++ include/ntgdi.h | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-)

2 1