October 2018 - Wine-Devel - list.winehq.org

[PATCH] rpcrt4: Handle absense of RPC flags in call_stubless_func() thunk.
by Zebediah Figura Oct. 8, 2018

Oct. 8, 2018

If Oi_HAS_RPCFLAGS is not set, then the stack size is at offset 4, not 8. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/cproxy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 2f49bb5..ab24b81 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -64,7 +64,10 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "movl 8(%ecx),%edx\n\t" /* info->FormatStringOffset */ "movzwl (%edx,%eax,2),%edx\n\t" /* FormatStringOffset[index] */ "addl 4(%ecx),%edx\n\t" /* info->ProcFormatString + offset */ - "movzwl 8(%edx),%eax\n\t" /* arguments size */ + "movzbl 1(%edx),%eax\n\t" /* Oi_flags */ + "andl $0x08,%eax\n\t" /* Oi_HAS_RPCFLAGS */ + "shrl $1,%eax\n\t" + "movzwl 4(%edx,%eax),%eax\n\t" /* arguments size */ "pushl %eax\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "leal 8(%esp),%eax\n\t" /* &This */ -- 2.7.4

2 1

[PATCH] gdi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Oct. 8, 2018

Oct. 8, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 6 +++--- dlls/gdi32/dibdrv/opengl.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 46 +++++++++++++++++++++--------------------- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 5 ++--- dlls/gdi32/freetype.c | 18 ++++++++--------- dlls/gdi32/gdiobj.c | 6 +++--- 11 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 1312bf0533..d95653c24c 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1627,7 +1627,7 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) if (!desc->pMemory) return STATUS_INVALID_PARAMETER; - for (i = 0; i < sizeof(format_info) / sizeof(*format_info); ++i) + for (i = 0; i < ARRAY_SIZE( format_info ); ++i) { if (format_info[i].format == desc->Format) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2c4d7d09db..3456002171 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -281,7 +281,7 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl if (region->rects[i].top >= rect.bottom) break; if (!intersect_rect( out, &rect, &region->rects[i] )) continue; out++; - if (out == &clip_rects->buffer[sizeof(clip_rects->buffer) / sizeof(RECT)]) + if (out == &clip_rects->buffer[ARRAY_SIZE( clip_rects->buffer )]) { clip_rects->rects = HeapAlloc( GetProcessHeap(), 0, region->numRects * sizeof(RECT) ); if (!clip_rects->rects) return 0; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 49cf38df22..08f8c3d6d2 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -759,7 +759,7 @@ static struct cached_glyph *cache_glyph_bitmap( DC *dc, struct cached_font *font if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX; indices[0] = index; - for (i = 0; i < sizeof(indices) / sizeof(indices[0]); i++) + for (i = 0; i < ARRAY_SIZE( indices ); i++) { index = indices[i]; ret = GetGlyphOutlineW( dc->hSelf, index, ggo_flags, &metrics, 0, NULL, &identity ); @@ -1260,7 +1260,7 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD total += counts[i]; } - if (total > sizeof(pt_buf) / sizeof(pt_buf[0])) + if (total > ARRAY_SIZE( pt_buf )) { points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; @@ -1330,7 +1330,7 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO total += counts[i]; } - if (total > sizeof(pt_buf) / sizeof(pt_buf[0])) + if (total > ARRAY_SIZE( pt_buf )) { points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); if (!points) return FALSE; diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 7c6043c2c6..be9ff4b1a1 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -125,7 +125,7 @@ static BOOL init_opengl(void) LOAD_FUNCPTR(OSMesaPixelStore); #undef LOAD_FUNCPTR - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + for (i = 0; i < ARRAY_SIZE( opengl_func_names ); i++) { if (!(((void **)&opengl_funcs.gl)[i] = pOSMesaGetProcAddress( opengl_func_names[i] ))) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index a99fcabc61..0d097b2da6 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -2393,7 +2393,7 @@ static void convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; DWORD dst_colors[256], i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = color_table[i].rgbRed << 16 | color_table[i].rgbGreen << 8 | color_table[i].rgbBlue; @@ -2417,7 +2417,7 @@ static void convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; DWORD dst_colors[16], i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = color_table[i].rgbRed << 16 | color_table[i].rgbGreen << 8 | color_table[i].rgbBlue; @@ -2445,7 +2445,7 @@ static void convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top); DWORD dst_colors[2], i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = color_table[i].rgbRed << 16 | color_table[i].rgbGreen << 8 | color_table[i].rgbBlue; @@ -2660,7 +2660,7 @@ static void convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re BYTE *src_start = get_pixel_ptr_8(src, src_rect->left, src_rect->top), *src_pixel; DWORD dst_colors[256], i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -2683,7 +2683,7 @@ static void convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re BYTE *src_start = get_pixel_ptr_4(src, src_rect->left, src_rect->top), *src_pixel; DWORD dst_colors[16], i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -2710,7 +2710,7 @@ static void convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re BYTE *src_start = get_pixel_ptr_1(src, src_rect->left, src_rect->top); DWORD dst_colors[2], i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -3151,7 +3151,7 @@ static void convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r WORD dst_colors[256]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = ((color_table[i].rgbRed << 7) & 0x7c00) | ((color_table[i].rgbGreen << 2) & 0x03e0) | ((color_table[i].rgbBlue >> 3) & 0x001f); @@ -3177,7 +3177,7 @@ static void convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r WORD dst_colors[16]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = ((color_table[i].rgbRed << 7) & 0x7c00) | ((color_table[i].rgbGreen << 2) & 0x03e0) | ((color_table[i].rgbBlue >> 3) & 0x001f); @@ -3207,7 +3207,7 @@ static void convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r WORD dst_colors[2]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = ((color_table[i].rgbRed << 7) & 0x7c00) | ((color_table[i].rgbGreen << 2) & 0x03e0) | ((color_table[i].rgbBlue >> 3) & 0x001f); @@ -3425,7 +3425,7 @@ static void convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re WORD dst_colors[256]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -3449,7 +3449,7 @@ static void convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re WORD dst_colors[16]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -3477,7 +3477,7 @@ static void convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re WORD dst_colors[2]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -3710,7 +3710,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec BYTE dst_colors[256]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_colortable(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -3735,7 +3735,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec BYTE dst_colors[16]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_colortable(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -3763,7 +3763,7 @@ static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec BYTE dst_colors[2]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = FILTER_DIBINDEX(color_table[i], rgbquad_to_pixel_colortable(dst, color_table[i])); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -4055,7 +4055,7 @@ static void convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec BYTE dst_colors[256]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_colortable(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -4109,7 +4109,7 @@ static void convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec BYTE dst_colors[16]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_colortable(dst, color_table[i]); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -4150,7 +4150,7 @@ static void convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec BYTE dst_colors[2]; int i; - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = FILTER_DIBINDEX(color_table[i], rgbquad_to_pixel_colortable(dst, color_table[i])); for(y = src_rect->top; y < src_rect->bottom; y++) @@ -5394,7 +5394,7 @@ static void mask_rect_32( const dib_info *dst, const RECT *rc, dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); /* Creating a BYTE-sized table so we don't need to mask the lsb of bit_val */ - for (i = 2; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 2; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = dst_colors[i & 1]; /* Special case starting and finishing in same byte, neither on byte boundary */ @@ -5731,12 +5731,12 @@ static void mask_rect_16( const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); if (dst->funcs == &funcs_555) - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = ((color_table[i].rgbRed << 7) & 0x7c00) | ((color_table[i].rgbGreen << 2) & 0x03e0) | ((color_table[i].rgbBlue >> 3) & 0x001f); else - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = rgbquad_to_pixel_masks(dst, color_table[i]); /* Special case starting and finishing in same byte, neither on byte boundary */ @@ -5872,7 +5872,7 @@ static void mask_rect_8( const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) dst_colors[i] = FILTER_DIBINDEX(color_table[i], rgbquad_to_pixel_colortable(dst, color_table[i])); /* Special case starting and finishing in same byte, neither on byte boundary */ @@ -6010,7 +6010,7 @@ static void mask_rect_4( const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE(dst_colors); i++) { dst_colors[i] = FILTER_DIBINDEX(color_table[i],rgbquad_to_pixel_colortable(dst, color_table[i])); /* Set high nibble to match so we don't need to shift it later. */ diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 2d8a9b04fb..a3360c269a 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -189,7 +189,7 @@ X(EMR_CREATECOLORSPACEW) static const char *get_emr_name(DWORD type) { unsigned int i; - for(i = 0; i < sizeof(emr_names) / sizeof(emr_names[0]); i++) + for(i = 0; i < ARRAY_SIZE(emr_names); i++) if(type == emr_names[i].type) return emr_names[i].name; TRACE("Unknown record type %d\n", type); return NULL; diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 99a089f1a2..305f052c0a 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -510,7 +510,7 @@ INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - if (cap >= 0 && cap < sizeof(physDev->dev_caps) / sizeof(physDev->dev_caps[0])) + if (cap >= 0 && cap < ARRAY_SIZE( physDev->dev_caps )) return physDev->dev_caps[cap]; return 0; } diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 8ff0e6c9f2..51133705a5 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -378,7 +378,7 @@ HDC WINAPI CreateEnhMetaFileW( ref_dc = CreateDCW( displayW, NULL, NULL, NULL ); memset( physDev->dev_caps, 0, sizeof(physDev->dev_caps) ); - for (cap = 0; cap < sizeof(physDev->dev_caps) / sizeof(physDev->dev_caps[0]); cap++) + for (cap = 0; cap < ARRAY_SIZE( physDev->dev_caps ); cap++) if (devcap_is_valid( cap )) physDev->dev_caps[cap] = GetDeviceCaps( ref_dc, cap ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c4b7cfb141..5c67d5b518 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -618,8 +618,7 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, logfont.lfPitchAndFamily = pitch; if (name) - lstrcpynW(logfont.lfFaceName, name, - sizeof(logfont.lfFaceName) / sizeof(WCHAR)); + lstrcpynW(logfont.lfFaceName, name, ARRAY_SIZE(logfont.lfFaceName)); else logfont.lfFaceName[0] = '\0'; @@ -1829,7 +1828,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, indices[0] = index; if (flags & ETO_GLYPH_INDEX) aa_flags |= GGO_GLYPH_INDEX; - for (i = 0; i < sizeof(indices) / sizeof(indices[0]); i++) + for (i = 0; i < ARRAY_SIZE( indices ); i++) { index = indices[i]; ret = GetGlyphOutlineW( hdc, index, aa_flags, metrics, 0, NULL, &identity ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b7e2413753..36a3431394 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1385,7 +1385,7 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) break; case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; - if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name->language_id >= ARRAY_SIZE( mac_langid_table )) return 0; name_lang = mac_langid_table[name->language_id]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -1395,7 +1395,7 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) case TT_APPLE_ID_DEFAULT: case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: - if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name->language_id >= ARRAY_SIZE( mac_langid_table )) return 0; name_lang = mac_langid_table[name->language_id]; break; default: @@ -2648,14 +2648,14 @@ static BOOL init_system_links(void) goto skip_internal; } - for (i = 0; i < sizeof(font_links_defaults_list)/sizeof(font_links_defaults_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(font_links_defaults_list); i++) { const FontSubst *psub2; psub2 = get_font_subst(&font_subst_list, font_links_defaults_list[i].shelldlg, -1); if ((!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name) || (psub2 && !strcmpiW(psub2->to.name,psub->to.name)))) { - for (j = 0; j < sizeof(font_links_list)/sizeof(font_links_list[0]); j++) + for (j = 0; j < ARRAY_SIZE(font_links_list); j++) populate_system_links(font_links_list[j], font_links_defaults_list[i].substitutes); if (!strcmpiW(psub->to.name, font_links_defaults_list[i].substitutes[0])) @@ -3052,7 +3052,7 @@ static char *get_winfonts_dir_path(LPCWSTR file) static const WCHAR slashW[] = {'\\','\0'}; WCHAR windowsdir[MAX_PATH]; - GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); + GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); strcatW(windowsdir, fontsW); strcatW(windowsdir, slashW); strcatW(windowsdir, file); @@ -3069,7 +3069,7 @@ static void load_system_fonts(void) char *unixname; if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { - GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); + GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); strcatW(windowsdir, fontsW); for(value = SystemFontValues; *value; value++) { dlen = sizeof(data); @@ -3138,7 +3138,7 @@ static void update_reg_entries(void) len = strlenW(name) + 1; if (face->scalable) - len += sizeof(TrueType) / sizeof(WCHAR); + len += ARRAY_SIZE(TrueType); valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); strcpyW(valueW, name); @@ -4025,7 +4025,7 @@ static void update_font_info(void) RegSetValueExW(hkey, logpixels, 0, REG_DWORD, (const BYTE *)&screen_dpi, sizeof(screen_dpi)); RegCloseKey(hkey); - for (i = 0; i < sizeof(nls_update_font_list)/sizeof(nls_update_font_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(nls_update_font_list); i++) { HKEY hkey; @@ -4186,7 +4186,7 @@ static void init_font_list(void) load_system_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ - GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); + GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); strcatW(windowsdir, fontsW); if((unixname = wine_get_unix_file_name(windowsdir))) { diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 819d24acf2..083a504569 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -503,7 +503,7 @@ static const struct DefaultFontInfo* get_default_fonts(UINT charset) { unsigned int n; - for(n=0;n<(sizeof(default_fonts)/sizeof(default_fonts[0]));n++) + for(n = 0; n < ARRAY_SIZE( default_fonts ); n++) { if ( default_fonts[n].charset == charset ) return &default_fonts[n]; @@ -1285,7 +1285,7 @@ INT WINAPI EnumObjects( HDC hdc, INT nObjType, { case OBJ_PEN: /* Enumerate solid pens */ - for (i = 0; i < sizeof(solid_colors)/sizeof(solid_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE( solid_colors ); i++) { pen.lopnStyle = PS_SOLID; pen.lopnWidth.x = 1; @@ -1300,7 +1300,7 @@ INT WINAPI EnumObjects( HDC hdc, INT nObjType, case OBJ_BRUSH: /* Enumerate solid brushes */ - for (i = 0; i < sizeof(solid_colors)/sizeof(solid_colors[0]); i++) + for (i = 0; i < ARRAY_SIZE( solid_colors ); i++) { brush.lbStyle = BS_SOLID; brush.lbColor = solid_colors[i]; -- 2.14.4

2 1

[PATCH] gdi32: Avoid a variable holding an ARRAY_SIZE
by Michael Stefaniuc Oct. 8, 2018

Oct. 8, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index dba5db0356..7c6043c2c6 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -94,7 +94,6 @@ static const struct { OSMESA_RGB_565, 16, 5, 0, 6, 5, 5, 11, 0, 0, 16, 32, 8 }, { OSMESA_RGB_565, 16, 5, 0, 6, 5, 5, 11, 0, 0, 16, 16, 8 }, }; -static const int nb_formats = sizeof(pixel_formats) / sizeof(pixel_formats[0]); static BOOL init_opengl(void) { @@ -148,7 +147,7 @@ failed: */ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr ) { - int ret = sizeof(pixel_formats) / sizeof(pixel_formats[0]); + int ret = ARRAY_SIZE( pixel_formats ); if (!descr) return ret; if (fmt <= 0 || fmt > ret) return 0; @@ -198,7 +197,7 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc ) if (!(context = HeapAlloc( GetProcessHeap(), 0, sizeof( *context )))) return NULL; context->format = GetPixelFormat( hdc ); - if (!context->format || context->format > nb_formats) context->format = 1; + if (!context->format || context->format > ARRAY_SIZE( pixel_formats )) context->format = 1; if (!(context->context = pOSMesaCreateContextExt( pixel_formats[context->format - 1].mesa, pixel_formats[context->format - 1].depth_bits, @@ -306,7 +305,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) */ static BOOL dibdrv_wglSetPixelFormat( HDC hdc, int fmt, const PIXELFORMATDESCRIPTOR *descr ) { - if (fmt <= 0 || fmt > nb_formats) return FALSE; + if (fmt <= 0 || fmt > ARRAY_SIZE( pixel_formats )) return FALSE; return GdiSetPixelFormat( hdc, fmt, descr ); } -- 2.14.4

2 1

[PATCH] user32: Add stub for SetWindowCompositionAttribute
by Alex Henrie Oct. 8, 2018

Oct. 8, 2018

Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44787 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I personally tested 1Password and this patch does get its main window to come up. However, the program still crashes because of bug 42692. --- .../ext-ms-win-ntuser-private-l1-1-1.spec | 2 +- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec b/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec index 958837ba2f..d75425c9ef 100644 --- a/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec @@ -15,7 +15,7 @@ @ stub RecordShutdownReason @ stdcall RegisterLogonProcess(long long) user32.RegisterLogonProcess @ stub SetThreadInputBlocked -@ stub SetWindowCompositionAttribute +@ stdcall SetWindowCompositionAttribute(ptr ptr) user32.SetWindowCompositionAttribute @ stdcall SetWindowStationUser(long long) user32.SetWindowStationUser @ stub SwitchDesktopWithFade @ stub UnlockWindowStation diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 61e0e4e8cc..a340e02adc 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -711,6 +711,7 @@ @ stdcall SetUserObjectInformationW(long long ptr long) @ stdcall SetUserObjectSecurity(long ptr ptr) @ stdcall SetWinEventHook(long long long ptr long long long) +@ stdcall SetWindowCompositionAttribute(ptr ptr) @ stdcall SetWindowContextHelpId(long long) @ stdcall SetWindowDisplayAffinity(long long) @ stub SetWindowFullScreenState diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2a55ab4ce6..95f5ac73c8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4183,3 +4183,13 @@ BOOL WINAPI SetWindowDisplayAffinity(HWND hwnd, DWORD affinity) SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + +/********************************************************************** + * SetWindowCompositionAttribute (USER32.@) + */ +BOOL WINAPI SetWindowCompositionAttribute(HWND hwnd, void *data) +{ + FIXME("(%p, %p): stub\n", hwnd, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} -- 2.19.0

1 0

[PATCH 1/3] advapi32/tests: Test return SIDs for wellknown two-character names.
by Nikolay Sivov Oct. 8, 2018

Oct. 8, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 113 +++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cf96369c4a..b9ef802cf8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -139,14 +139,6 @@ static HMODULE hmod; static int myARGC; static char** myARGV; -struct strsid_entry -{ - const char *str; - DWORD flags; -}; -#define STRSID_OK 0 -#define STRSID_OPT 1 - #define SID_SLOTS 4 static char debugsid_str[SID_SLOTS][256]; static int debugsid_index = 0; @@ -307,23 +299,59 @@ static void test_sid(void) { { {0x00,0x00,0x00,0x00,0x00,0x02} }, "S-1-2-1" }, { { {0x00,0x00,0x00,0x00,0x00,0x0c} }, "S-1-12-1" }, }; - struct strsid_entry strsid_table[] = { - {"AO", STRSID_OK}, {"RU", STRSID_OK}, {"AN", STRSID_OK}, {"AU", STRSID_OK}, - {"BA", STRSID_OK}, {"BG", STRSID_OK}, {"BO", STRSID_OK}, {"BU", STRSID_OK}, - {"CA", STRSID_OPT}, {"CG", STRSID_OK}, {"CO", STRSID_OK}, {"DA", STRSID_OPT}, - {"DC", STRSID_OPT}, {"DD", STRSID_OPT}, {"DG", STRSID_OPT}, {"DU", STRSID_OPT}, - {"EA", STRSID_OPT}, {"ED", STRSID_OK}, {"WD", STRSID_OK}, {"PA", STRSID_OPT}, - {"IU", STRSID_OK}, {"LA", STRSID_OK}, {"LG", STRSID_OK}, {"LS", STRSID_OK}, - {"SY", STRSID_OK}, {"NU", STRSID_OK}, {"NO", STRSID_OK}, {"NS", STRSID_OK}, - {"PO", STRSID_OK}, {"PS", STRSID_OK}, {"PU", STRSID_OK}, {"RS", STRSID_OPT}, - {"RD", STRSID_OK}, {"RE", STRSID_OK}, {"RC", STRSID_OK}, {"SA", STRSID_OPT}, - {"SO", STRSID_OK}, {"SU", STRSID_OK}}; + static const struct + { + const char *name; + const char *sid; + unsigned int optional; + } + str_to_sid_tests[] = + { + { "WD", "S-1-1-0" }, + { "CO", "S-1-3-0" }, + { "CG", "S-1-3-1" }, + { "NU", "S-1-5-2" }, + { "IU", "S-1-5-4" }, + { "SU", "S-1-5-6" }, + { "AN", "S-1-5-7" }, + { "ED", "S-1-5-9" }, + { "PS", "S-1-5-10" }, + { "AU", "S-1-5-11" }, + { "RC", "S-1-5-12" }, + { "SY", "S-1-5-18" }, + { "LS", "S-1-5-19" }, + { "NS", "S-1-5-20" }, + { "LA", "S-1-5-21-*-*-*-500" }, + { "LG", "S-1-5-21-*-*-*-501" }, + { "BO", "S-1-5-32-551" }, + { "BA", "S-1-5-32-544" }, + { "BU", "S-1-5-32-545" }, + { "BG", "S-1-5-32-546" }, + { "PU", "S-1-5-32-547" }, + { "AO", "S-1-5-32-548" }, + { "SO", "S-1-5-32-549" }, + { "PO", "S-1-5-32-550" }, + { "RE", "S-1-5-32-552" }, + { "RU", "S-1-5-32-554" }, + { "RD", "S-1-5-32-555" }, + { "NO", "S-1-5-32-556" }, + { "CA", "", 1 }, + { "DA", "", 1 }, + { "DC", "", 1 }, + { "DD", "", 1 }, + { "DG", "", 1 }, + { "DU", "", 1 }, + { "EA", "", 1 }, + { "PA", "", 1 }, + { "RS", "", 1 }, + { "SA", "", 1 }, + }; const char noSubAuthStr[] = "S-1-5"; unsigned int i; PSID psid = NULL; SID *pisid; - BOOL r; + BOOL r, ret; LPSTR str = NULL; if( !pConvertStringSidToSidA ) @@ -403,43 +431,30 @@ static void test_sid(void) LocalFree( psid ); } - /* string constant format not supported before XP */ - r = pConvertStringSidToSidA(strsid_table[0].str, &psid); - if(!r) + for (i = 0; i < ARRAY_SIZE(str_to_sid_tests); i++) { - win_skip("String constant format not supported\n"); - return; - } - LocalFree(psid); - - for(i = 0; i < ARRAY_SIZE(strsid_table); i++) - { - char *temp; - - SetLastError(0xdeadbeef); - r = pConvertStringSidToSidA(strsid_table[i].str, &psid); + char *str; - if (!(strsid_table[i].flags & STRSID_OPT)) + ret = ConvertStringSidToSidA(str_to_sid_tests[i].name, &psid); + if (!ret && str_to_sid_tests[i].optional) { - ok(r, "%s: got %u\n", strsid_table[i].str, GetLastError()); + skip("%u: failed to convert %s.\n", i, str_to_sid_tests[i].name); + continue; } + ok(ret, "%u: failed to convert string to sid.\n", i); - if (r) + if (str_to_sid_tests[i].optional || !strcmp(str_to_sid_tests[i].name, "LA") || + !strcmp(str_to_sid_tests[i].name, "LG")) { - if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp))) - { - trace(" %s: %s\n", strsid_table[i].str, temp); - LocalFree(temp); - } LocalFree(psid); + continue; } - else - { - if (GetLastError() != ERROR_INVALID_SID) - trace(" %s: couldn't be converted, returned %d\n", strsid_table[i].str, GetLastError()); - else - trace(" %s: couldn't be converted\n", strsid_table[i].str); - } + + ret = ConvertSidToStringSidA(psid, &str); + ok(ret, "%u: failed to convert SID to string.\n", i); + ok(!strcmp(str, str_to_sid_tests[i].sid), "%u: unexpected sid %s.\n", i, str); + LocalFree(psid); + LocalFree(str); } } -- 2.19.0

1 2

[PATCH] quartz/filtergraph: Don't prevent the same filter from being used multiple times in IGraphBuilder_Connect().
by Zebediah Figura Oct. 7, 2018

Oct. 7, 2018

This reverts part of 6301fec0e. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Should fix extant test failures, e.g. http://test.winehq.org/data/2e754a652725c067bc44445cebe8b96487ec4a6e/linux_… dlls/quartz/filtergraph.c | 25 ------------------------- dlls/quartz/tests/filtergraph.c | 1 + 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c859564..07d40db 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1091,7 +1091,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, GUID tab[2]; IMoniker* pMoniker; PIN_INFO PinInfo; - CLSID FilterCLSID; PIN_DIRECTION dir; IFilterMapper2 *pFilterMapper2 = NULL; @@ -1184,15 +1183,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, IEnumPins_Release(penumpins); } - hr = IPin_QueryPinInfo(ppinIn, &PinInfo); - if (FAILED(hr)) - goto out; - - hr = IBaseFilter_GetClassID(PinInfo.pFilter, &FilterCLSID); - IBaseFilter_Release(PinInfo.pFilter); - if (FAILED(hr)) - goto out; - /* Find the appropriate transform filter than can transform the minor media type of output pin of the upstream * filter to the minor mediatype of input pin of the renderer */ hr = IPin_EnumMediaTypes(ppinOut, &penummt); @@ -1236,7 +1226,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, while (IEnumMoniker_Next(pEnumMoniker, 1, &pMoniker, NULL) == S_OK) { VARIANT var; - GUID clsid; IPin* ppinfilter = NULL; IBaseFilter* pfilter = NULL; IAMGraphBuilderCallback *callback = NULL; @@ -1254,20 +1243,6 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IBaseFilter_GetClassID(pfilter, &clsid); - if (FAILED(hr)) - { - IBaseFilter_Release(pfilter); - goto error; - } - - if (IsEqualGUID(&clsid, &FilterCLSID)) { - /* Skip filter (same as the one the output pin belongs to) */ - IBaseFilter_Release(pfilter); - pfilter = NULL; - goto error; - } - if (This->pSite) { IUnknown_QueryInterface(This->pSite, &IID_IAMGraphBuilderCallback, (LPVOID*)&callback); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e64a9fa..897ba3a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1271,6 +1271,7 @@ static ULONG WINAPI testfilter_Release(IBaseFilter *iface) static HRESULT WINAPI testfilter_GetClassID(IBaseFilter *iface, CLSID *clsid) { if (winetest_debug > 1) trace("%p->GetClassID()\n", iface); + memset(clsid, 0xde, sizeof(*clsid)); return S_OK; } -- 2.7.4

1 0

[PATCH] po: Update Norwegian translation.
by Kim Malmo Oct. 7, 2018

Oct. 7, 2018

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 9f82b1f460..1245fe4f40 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-06 19:05+0200\n" +"PO-Revision-Date: 2018-10-07 20:50+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -403,16 +403,12 @@ msgid "&Retry" msgstr "P&røv igjen" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "&Skjul faner" +msgstr "Skjul detaljer" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Detaljer" +msgstr "Se detaljer" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3452,18 +3448,16 @@ msgid "Connections" msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Oppsett av Wine" +msgstr "Automatisk oppsett" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Bruk automatisk oppdagelse (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Bruk automatisk oppsett skript (PAC)" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:" @@ -7585,7 +7579,7 @@ msgstr "sidefane" #: oleacc.rc:69 msgid "property page" -msgstr "fane" +msgstr "egenskap fane" #: oleacc.rc:70 msgid "indicator" @@ -11054,10 +11048,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Feil: \"%c\" er et ugyldig valg.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Feil: Klarte ikke finne prosessen \"%1\".\n" +msgstr "Feil: Kunne ikke finne vertsnavn: %u.\n" #: hostname.rc:33 msgid "" @@ -14220,11 +14212,11 @@ msgstr "&Farge:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME typer" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Behandle fil &assosiasjoner" #: winecfg.rc:308 msgid "Folders" -- 2.17.1

1 0

[PATCH 1/2] d3d11: Implement depth bias clamp.
by Zebediah Figura Oct. 6, 2018

Oct. 6, 2018

Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/state.c | 1 + dlls/wined3d/adapter_gl.c | 3 +++ dlls/wined3d/cs.c | 2 ++ dlls/wined3d/state.c | 16 ++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c36b87f..6de3502 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1081,6 +1081,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_clip = desc->DepthClipEnable; + wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2f2d09d..6240b88 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -183,6 +183,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, {"GL_EXT_packed_float", EXT_PACKED_FLOAT }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS }, + {"GL_EXT_polygon_offset_clamp", EXT_POLYGON_OFFSET_CLAMP }, {"GL_EXT_provoking_vertex", EXT_PROVOKING_VERTEX }, {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR }, {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE }, @@ -2475,6 +2476,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) + /* GL_EXT_polgyon_offset_clamp */ + USE_GL_FUNC(glPolygonOffsetClampEXT) /* GL_EXT_provoking_vertex */ USE_GL_FUNC(glProvokingVertexEXT) /* GL_EXT_secondary_color */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index af1dbef..030e80f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1135,6 +1135,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILENABLE)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); + device_invalidate_state(device, STATE_RASTERIZER); } else if (prev && prev->format->depth_bias_scale != op->view->format->depth_bias_scale) { @@ -1561,6 +1562,7 @@ static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const vo cs->state.rasterizer_state = op->state; device_invalidate_state(cs->device, STATE_RASTERIZER); + device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3b2f845..dc29d54 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1775,7 +1775,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; - float factor, units, scale; + float factor, units, scale, clamp; union { @@ -1785,6 +1785,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; + clamp = state->rasterizer_state->desc.depth_bias_clamp; if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) { @@ -1811,7 +1812,18 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 } gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); - gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + if (gl_info->supported[EXT_POLYGON_OFFSET_CLAMP]) + { + GL_EXTCALL(glPolygonOffsetClampEXT(factor, units, clamp)); + checkGLcall("glPolygonOffsetClampEXT(...)"); + } + else + { + if (clamp) + WARN("EXT_polygon_offset_clamp extension missing; no support for depth bias clamping.\n"); + + gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); + } } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2a985da..2f6ba64 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -167,6 +167,7 @@ enum wined3d_gl_extension EXT_PACKED_DEPTH_STENCIL, EXT_PACKED_FLOAT, EXT_POINT_PARAMETERS, + EXT_POLYGON_OFFSET_CLAMP, EXT_PROVOKING_VERTEX, EXT_SECONDARY_COLOR, EXT_STENCIL_TWO_SIDE, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8197a86..efc2fde 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2013,6 +2013,7 @@ struct wined3d_rasterizer_state_desc { BOOL front_ccw; BOOL depth_clip; + float depth_bias_clamp; }; struct wined3d_sampler_desc -- 2.7.4

2 2

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Oct. 6, 2018

Oct. 6, 2018

1 0

[PATCH 1/7] widl: Allow all dimensions of an array to be sizeless.
by Zebediah Figura Oct. 5, 2018

Oct. 5, 2018

MIDL achieves this by setting the size of the inner arrays to a constant value. widl actually already handles this (but uses 0 instead of 1.) Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Note that proxy generation is still broken with this commit; the goal here is simply to separate this change from other patches. tools/widl/parser.y | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bf715c8..53a5ec0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1456,7 +1456,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl var_t *v = decl->var; expr_list_t *sizes = get_attrp(attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(attrs, ATTR_LENGTHIS); - int sizeless; expr_t *dim; type_t **ptype; array_dims_t *arr = decl ? decl->array : NULL; @@ -1551,12 +1550,8 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl v->name); ptype = &v->type; - sizeless = FALSE; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { - if (sizeless) - error_loc("%s: only the first array dimension can be unspecified\n", v->name); - if (dim->is_const) { if (dim->cval <= 0) @@ -1571,8 +1566,6 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: total array size is too large\n", v->name); } } - else - sizeless = TRUE; *ptype = type_new_array(NULL, *ptype, FALSE, dim->is_const ? dim->cval : 0, -- 2.7.4

2 7