September 2021 - Wine-commits

Chip Davis : winemac.drv: Use a mask layer to support window regions.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 01f027b2db3196a8fe43be3d6718227794362985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f027b2db3196a8fe43be3d… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:21 2021 -0500 winemac.drv: Use a mask layer to support window regions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 2 - dlls/winemac.drv/cocoa_window.m | 90 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 47 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index f9c3902dc36..d04961f8251 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -51,8 +51,6 @@ NSRect wineFrame; NSRect roundedWineFrame; - NSBezierPath* shape; - NSData* shapeData; BOOL shapeChangedSinceLastDraw; BOOL colorKeyed; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 29a5abe6344..013af035a12 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -321,6 +321,22 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi #endif +(a)interface CAShapeLayer (WineShapeMaskExtensions) + +(a)property(readonly, nonatomic, getter=isEmptyShaped) BOOL emptyShaped; + +(a)end + +(a)implementation CAShapeLayer (WineShapeMaskExtensions) + + - (BOOL) isEmptyShaped + { + return CGRectEqualToRect(CGPathGetBoundingBox(self.path), CGRectZero); + } + +(a)end + + @interface WineBaseView : NSView @end @@ -388,8 +404,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (nonatomic) void* surface; @property (nonatomic) pthread_mutex_t* surface_mutex; -(a)property (copy, nonatomic) NSBezierPath* shape; -(a)property (copy, nonatomic) NSData* shapeData; @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -402,6 +416,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (readonly, copy, nonatomic) NSArray* childWineWindows; + - (void) setShape:(CGPathRef)newShape; + - (void) updateForGLSubviews; - (BOOL) becameEligibleParentOrChild; @@ -494,17 +510,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([window contentView] != self) return; - if (window.drawnSinceShown && window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) - { - [[NSColor clearColor] setFill]; - NSRectFill(rect); - - [window.shape addClip]; - - [[NSColor windowBackgroundColor] setFill]; - NSRectFill(rect); - } - if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { @@ -517,8 +522,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi CGContextRef context; int i; - [window.shape addClip]; - context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; CGContextSetBlendMode(context, kCGBlendModeCopy); CGContextSetInterpolationQuality(context, retina_on ? kCGInterpolationHigh : kCGInterpolationNone); @@ -968,7 +971,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; @synthesize surface, surface_mutex; - @synthesize shape, shapeData, shapeChangedSinceLastDraw; + @synthesize shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; @@ -1069,8 +1072,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [queue release]; [latentChildWindows release]; [latentParentWindow release]; - [shape release]; - [shapeData release]; [super dealloc]; } @@ -2011,7 +2012,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) needsTransparency { - return self.shape || self.colorKeyed || self.usePerPixelAlpha || + return self.contentView.layer.mask || self.colorKeyed || self.usePerPixelAlpha || (gl_surface_mode == GL_SURFACE_BEHIND && [(WineContentView*)self.contentView hasGLDescendant]); } @@ -2033,22 +2034,27 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } - - (void) setShape:(NSBezierPath*)newShape + - (void) setShape:(CGPathRef)newShape { - if (shape == newShape) return; + CALayer* layer = [[self contentView] layer]; + CAShapeLayer* mask = (CAShapeLayer*)layer.mask; + if (CGPathEqualToPath(newShape, mask.path)) return; - if (shape) - { - [[self contentView] setNeedsDisplayInRect:[shape bounds]]; - [shape release]; - } + if (newShape && !layer.mask) + layer.mask = mask = [CAShapeLayer layer]; + else if (!newShape) + layer.mask = mask = nil; + + if (mask.path) + [[self contentView] setNeedsDisplayInRect:NSRectFromCGRect(CGPathGetBoundingBox(mask.path))]; if (newShape) - [[self contentView] setNeedsDisplayInRect:[newShape bounds]]; + [[self contentView] setNeedsDisplayInRect:NSRectFromCGRect(CGPathGetBoundingBox(newShape))]; - shape = [newShape copy]; + mask.path = newShape; self.shapeChangedSinceLastDraw = TRUE; [self checkTransparency]; + [self checkEmptyShaped]; } - (void) makeFocused:(BOOL)activate @@ -2245,7 +2251,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) isEmptyShaped { - return (self.shapeData.length == sizeof(CGRectZero) && !memcmp(self.shapeData.bytes, &CGRectZero, sizeof(CGRectZero))); + CAShapeLayer* mask = (CAShapeLayer*)[[self contentView] layer].mask; + return ([mask isEmptyShaped]); } - (BOOL) canProvideSnapshot @@ -2648,8 +2655,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [transform scaleBy:scale]; - if (shape) - [shape transformUsingAffineTransform:transform]; + [[self contentView] layer].mask.contentsScale = mode ? 2.0 : 1.0; for (WineBaseView* subview in [self.contentView subviews]) { @@ -3453,25 +3459,19 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) OnMainThread(^{ if (!rects || !count) { - window.shape = nil; - window.shapeData = nil; + [window setShape:NULL]; [window checkEmptyShaped]; } else { - size_t length = sizeof(*rects) * count; - if (window.shapeData.length != length || memcmp(window.shapeData.bytes, rects, length)) - { - NSBezierPath* path; - unsigned int i; + CGMutablePathRef path; + unsigned int i; - path = [NSBezierPath bezierPath]; - for (i = 0; i < count; i++) - [path appendBezierPathWithRect:NSRectFromCGRect(cgrect_mac_from_win(rects[i]))]; - window.shape = path; - window.shapeData = [NSData dataWithBytes:rects length:length]; - [window checkEmptyShaped]; - } + path = CGPathCreateMutable(); + for (i = 0; i < count; i++) + CGPathAddRect(path, NULL, cgrect_mac_from_win(rects[i])); + [window setShape:path]; + CGPathRelease(path); } });

1 0

Chip Davis : winemac.drv: Move GL context update code to -viewWillDraw method.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: cad2a7c8e1ad97eaf8bbb7479f8c5ad8dca8a10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad2a7c8e1ad97eaf8bbb747… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:22 2021 -0500 winemac.drv: Move GL context update code to -viewWillDraw method. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 013af035a12..677dc07ae16 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -491,9 +491,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return YES; } - - (void) drawRect:(NSRect)rect + - (void) viewWillDraw { - WineWindow* window = (WineWindow*)[self window]; + [super viewWillDraw]; for (WineOpenGLContext* context in pendingGlContexts) { @@ -506,6 +506,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } [glContexts addObjectsFromArray:pendingGlContexts]; [pendingGlContexts removeAllObjects]; + } + + - (void) drawRect:(NSRect)rect + { + WineWindow* window = (WineWindow*)[self window]; if ([window contentView] != self) return;

1 0

Chip Davis : winemac.drv: Set the surface contents directly to the layer.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 9e599a89e30c9ae403f5c7861e0f7690a03c4e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e599a89e30c9ae403f5c786… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:23 2021 -0500 winemac.drv: Set the surface contents directly to the layer. Use a top-down DIB for the surface instead of a bottom-up DIB. This seems to match better with how Core Graphics expects to receive image data, and allows us to avoid a transform to flip the surface image. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 86 +++++++++++++++++++++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 3 +- dlls/winemac.drv/surface.c | 42 ++++++++++++++------ 3 files changed, 101 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e599a89e30c9ae403f5…

1 0

Chip Davis : winemac.drv: Remove now unused -[WineContentView drawRect:].
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 3f845b34deada0dd58e3674119af47ce85851c24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f845b34deada0dd58e36741… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:24 2021 -0500 winemac.drv: Remove now unused -[WineContentView drawRect:]. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 64 ----------------------------------------- 1 file changed, 64 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 85e13b5823f..eec750706a8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -556,70 +556,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [pendingGlContexts removeAllObjects]; } - - (void) drawRect:(NSRect)rect - { - WineWindow* window = (WineWindow*)[self window]; - - if ([window contentView] != self) - return; - - if (window.surface && window.surface_mutex && - !pthread_mutex_lock(window.surface_mutex)) - { - const CGRect* rects; - int count; - - if (get_surface_blit_rects(window.surface, &rects, &count)) - { - CGRect dirtyRect = cgrect_win_from_mac(NSRectToCGRect(rect)); - NSAffineTransform* xform = [NSAffineTransform transform]; - CGContextRef context; - int i; - - [xform translateXBy:0.0 yBy:self.bounds.size.height]; - [xform scaleXBy:1.0 yBy:-1.0]; - [xform concat]; - - context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - CGContextSetBlendMode(context, kCGBlendModeCopy); - CGContextSetInterpolationQuality(context, retina_on ? kCGInterpolationHigh : kCGInterpolationNone); - - for (i = 0; i < count; i++) - { - CGRect imageRect; - CGImageRef image; - - imageRect = CGRectIntersection(rects[i], dirtyRect); - image = create_surface_image(window.surface, &imageRect, FALSE, window.colorKeyed, - window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue); - - if (image) - { - // Account for the flipped coordinate system. - imageRect = cgrect_mac_from_win(imageRect); - imageRect.origin.y = self.bounds.size.height - imageRect.origin.y - imageRect.size.height; - CGContextDrawImage(context, imageRect, image); - - CGImageRelease(image); - } - } - - [window windowDidDrawContent]; - } - - pthread_mutex_unlock(window.surface_mutex); - } - - // If the window may be transparent, then we have to invalidate the - // shadow every time we draw. Also, if this is the first time we've - // drawn since changing from transparent to opaque. - if (window.drawnSinceShown && (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw)) - { - window.shapeChangedSinceLastDraw = FALSE; - [window invalidateShadow]; - } - } - - (void) addGLContext:(WineOpenGLContext*)context { BOOL hadContext = _everHadGLContext;

1 0

Anton Baskanov : wined3d: Fix the odd line condition in gen_yv12_read().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: f4d2bdddcac7ca4a13b857ebc1e92ae45cb481c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d2bdddcac7ca4a13b857eb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Aug 31 23:26:24 2021 +0700 wined3d: Fix the odd line condition in gen_yv12_read(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..c760d519b30 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12621,8 +12621,10 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll * get filtering bleeding. */ - /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep + * in mind that each line of the chroma plane corresponds to 2 lines of the + * resulting image. */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */

1 0

Anton Baskanov : wined3d: Simplify the odd line condition in gen_yv12_read().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: e3db02d0cb55155044bff1b3d4851124dad20a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3db02d0cb55155044bff1b3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Aug 31 23:26:25 2021 +0700 wined3d: Simplify the odd line condition in gen_yv12_read(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c760d519b30..fb809052d83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12624,7 +12624,7 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep * in mind that each line of the chroma plane corresponds to 2 lines of the * resulting image. */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); + shader_addline(buffer, " if (fract(texcoord.y * size.y * 0.25) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */

1 0

Francois Gouget : windowscodecs: Make the png_{de,en}coder_*() functions static.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 914b27bce5235980c3b3898bb0797415711c22ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=914b27bce5235980c3b3898b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:50:57 2021 +0200 windowscodecs: Make the png_{de,en}coder_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Francois Gouget : wined3d: Make wined3d_context_vk_allocate_memory() static.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 4a5d95272c945bba494b6461bff9f3c354ef5a92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5d95272c945bba494b6461… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:51:06 2021 +0200 wined3d: Make wined3d_context_vk_allocate_memory() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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,

1 0

Eric Pouech : dbghelp: Tidy up internals for array type.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 35c45857aeb39d8bf63863585aca553bd3496344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c45857aeb39d8bf6386358… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 31 14:13:26 2021 +0200 dbghelp: Tidy up internals for array type. Mainly remove hackish storage of information with negative value and use a uniform min/count pair for all debug formats. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/dwarf.c | 12 ++++++------ dlls/dbghelp/msc.c | 10 +++++++++- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/type.c | 23 ++++------------------- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2906a5df6c3..2b0365bc386 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -254,7 +254,7 @@ struct symt_array { struct symt symt; int start; - int end; /* end index if > 0, or -array_len (in bytes) if < 0 */ + DWORD count; struct symt* base_type; struct symt* index_type; }; @@ -812,7 +812,7 @@ extern BOOL symt_add_enum_element(struct module* module, struct symt_enum* enum_type, const char* name, int value) DECLSPEC_HIDDEN; extern struct symt_array* - symt_new_array(struct module* module, int min, int max, + symt_new_array(struct module* module, int min, DWORD count, struct symt* base, struct symt* index) DECLSPEC_HIDDEN; extern struct symt_function_signature* symt_new_function_signature(struct module* module, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 375a0d6d728..93baf10ba44 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1266,7 +1266,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, /* FIXME: int4 even on 64bit machines??? */ idx_type = ctx->symt_cache[sc_int4]; min.u.uvalue = 0; - max.u.uvalue = -1; + cnt.u.uvalue = 0; } else for (i = 0; i < vector_length(children); i++) { @@ -1277,10 +1277,10 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, idx_type = dwarf2_lookup_type(ctx, child); if (!dwarf2_find_attribute(ctx, child, DW_AT_lower_bound, &min)) min.u.uvalue = 0; - if (!dwarf2_find_attribute(ctx, child, DW_AT_upper_bound, &max)) - max.u.uvalue = 0; - if (dwarf2_find_attribute(ctx, child, DW_AT_count, &cnt)) - max.u.uvalue = min.u.uvalue + cnt.u.uvalue; + if (dwarf2_find_attribute(ctx, child, DW_AT_upper_bound, &max)) + cnt.u.uvalue = max.u.uvalue + 1 - min.u.uvalue; + else if (!dwarf2_find_attribute(ctx, child, DW_AT_count, &cnt)) + cnt.u.uvalue = 0; break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %s\n", @@ -1288,7 +1288,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, break; } } - di->symt = &symt_new_array(ctx->module, min.u.uvalue, max.u.uvalue, ref_type, idx_type)->symt; + di->symt = &symt_new_array(ctx->module, min.u.uvalue, cnt.u.uvalue, ref_type, idx_type)->symt; return di->symt; } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 18535b9d151..905e3b0eaf1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -671,8 +671,16 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, { struct symt* elem = codeview_fetch_type(ctp, elemtype, FALSE); struct symt* index = codeview_fetch_type(ctp, indextype, FALSE); + DWORD64 elem_size; + DWORD count = 0; - return &symt_new_array(ctp->module, 0, -arr_len, elem, index)->symt; + if (symt_get_info(ctp->module, elem, TI_GET_LENGTH, &elem_size) && elem_size) + { + if (arr_len % (DWORD)elem_size) + FIXME("array size should be a multiple of element size %u %u\n", arr_len, (DWORD)elem_size); + count = arr_len / (unsigned)elem_size; + } + return &symt_new_array(ctp->module, 0, count, elem, index)->symt; } static BOOL codeview_add_type_enum_field_list(struct module* module, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index f51ba962186..b011c123482 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -758,7 +758,7 @@ static inline int stabs_pts_read_array(struct ParseTypedefData* ptd, PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &base_dt) == -1); - *adt = &symt_new_array(ptd->module, lo, hi, base_dt, range_dt)->symt; + *adt = &symt_new_array(ptd->module, lo, hi - lo + 1, base_dt, range_dt)->symt; return 0; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 0fa3b669467..7ce85531162 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -350,7 +350,7 @@ BOOL symt_add_enum_element(struct module* module, struct symt_enum* enum_type, return TRUE; } -struct symt_array* symt_new_array(struct module* module, int min, int max, +struct symt_array* symt_new_array(struct module* module, int min, DWORD cnt, struct symt* base, struct symt* index) { struct symt_array* sym; @@ -359,7 +359,7 @@ struct symt_array* symt_new_array(struct module* module, int min, int max, { sym->symt.tag = SymTagArrayType; sym->start = min; - sym->end = max; + sym->count = cnt; sym->base_type = base; sym->index_type = index; symt_add_type(module, &sym->symt); @@ -367,21 +367,6 @@ struct symt_array* symt_new_array(struct module* module, int min, int max, return sym; } -static inline DWORD symt_array_count(struct module* module, const struct symt_array* array) -{ - if (array->end < 0) - { - DWORD64 elem_size; - /* One could want to also set the array->end field in array, but we won't do it - * as long as all the get_type() helpers use const objects - */ - if (symt_get_info(module, array->base_type, TI_GET_LENGTH, &elem_size) && elem_size) - return -array->end / (DWORD)elem_size; - return 0; - } - return array->end - array->start + 1; -} - struct symt_function_signature* symt_new_function_signature(struct module* module, struct symt* ret_type, enum CV_call_e call_conv) @@ -630,7 +615,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { case SymTagArrayType: - X(DWORD) = symt_array_count(module, (const struct symt_array*)type); + X(DWORD) = ((const struct symt_array*)type)->count; break; case SymTagFunctionType: /* this seems to be wrong for (future) C++ methods, where 'this' parameter @@ -676,7 +661,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, if (!symt_get_info(module, ((const struct symt_array*)type)->base_type, TI_GET_LENGTH, pInfo)) return FALSE; - X(DWORD64) *= symt_array_count(module, (const struct symt_array*)type); + X(DWORD64) *= ((const struct symt_array*)type)->count; break; case SymTagPublicSymbol: X(DWORD64) = ((const struct symt_public*)type)->size;

1 0

Guillaume Charifi : kernelbase: Add stub for SetProcessGroupAffinity().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 629ced155e083c8e2f9646835bf63b2ea0ce683e URL: https://source.winehq.org/git/wine.git/?a=commit;h=629ced155e083c8e2f964683… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Aug 31 12:45:53 2021 +0200 kernelbase: Add stub for SetProcessGroupAffinity(). Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e1fb19eceb0..dd9f4a8ddce 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1460,7 +1460,7 @@ @ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) @ stdcall SetProcessAffinityUpdateMode(long long) # @ stub SetProcessDefaultCpuSets -# @ stub SetProcessGroupAffinity +@ stdcall SetProcessGroupAffinity(long ptr ptr) # @ stub SetProcessInformation @ stdcall SetProcessMitigationPolicy(long ptr long) @ stdcall SetProcessPreferredUILanguages(long ptr ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 101d3fa3213..5973eb7d933 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1133,6 +1133,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessAffinityUpdateMode( HANDLE process, DWOR } +/*********************************************************************** + * SetProcessGroupAffinity (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetProcessGroupAffinity( HANDLE process, const GROUP_AFFINITY *new, + GROUP_AFFINITY *old ) +{ + FIXME( "(%p,%p,%p): stub\n", process, new, old ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /********************************************************************** * SetProcessMitigationPolicy (kernelbase.@) */

1 0