- wine-devel - winehq.org

[PATCH] wbemprox: Support specifying server and namespace in WbemServices functions
by Piotr Caban 16 Oct '18

16 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/services.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 27 ++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 7 deletions(-)

2 1

[PATCH] include : Add missing XINPUT_CAPS_ defines
by Alistair Leslie-Hughes 16 Oct '18

16 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xinput.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/xinput.h b/include/xinput.h index dae8cad..73b8c92 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -157,6 +157,9 @@ #define XUSER_INDEX_ANY 0x000000FF #define XINPUT_CAPS_FFB_SUPPORTED 0x0001 +#define XINPUT_CAPS_WIRELESS 0x0002 +#define XINPUT_CAPS_PMD_SUPPORTED 0x0008 +#define XINPUT_CAPS_NO_NAVIGATION 0x0010 /* * Defines the structure of an xbox 360 joystick. -- 1.9.1

1 0

[PATCH 2/2] shell32: Properly fail when a data object cannot be created.
by Alistair Leslie-Hughes 16 Oct '18

16 Oct '18

Based of patch by Mark Jansen Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlexec.c | 15 +++++++-------- dlls/shell32/tests/shlexec.c | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 0b794b0..1e795ac 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1165,13 +1165,12 @@ static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) return hkey; } -static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) +static HRESULT shellex_get_dataobj( LPSHELLEXECUTEINFOW sei, IDataObject **dataobj ) { LPCITEMIDLIST pidllast = NULL; - IDataObject *dataobj = NULL; IShellFolder *shf = NULL; LPITEMIDLIST pidl = NULL; - HRESULT r; + HRESULT r = SE_ERR_DLLNOTFOUND; if (sei->fMask & SEE_MASK_CLASSALL) pidl = sei->lpIDList; @@ -1192,15 +1191,15 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) if ( FAILED( r ) ) goto end; - IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast, - &IID_IDataObject, NULL, (LPVOID*) &dataobj ); + r = IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast, + &IID_IDataObject, NULL, (void**)dataobj ); end: if ( pidl != sei->lpIDList ) ILFree( pidl ); if ( shf ) IShellFolder_Release( shf ); - return dataobj; + return r; } static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, @@ -1295,8 +1294,8 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC goto end; } - dataobj = shellex_get_dataobj( sei ); - if ( !dataobj ) + r = shellex_get_dataobj( sei, &dataobj ); + if ( FAILED( r ) ) { ERR("failed to get data object\n"); goto end; diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index bb2b842..9dff9f8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1780,7 +1780,7 @@ static fileurl_tests_t fileurl_tests[]= {"file:///", "%%TMPDIR%%\\test file.shlexec", 0, 0}, /* Test shortcuts vs. URLs */ - {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, + {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1c}, /* Confuse things by mixing protocols */ {"file://", "shlproto://foo/bar", USE_COLON, 0}, @@ -1926,11 +1926,11 @@ static void test_urls(void) } /* A .lnk ending does not turn a URL into a shortcut */ - todo_wait rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); + rc = shell_execute(NULL, "shlproto://foo/bar.lnk", NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "URL"); - todo_wine okChildString("argvA4", "shlproto://foo/bar.lnk"); + okChildString("argvA3", "URL"); + okChildString("argvA4", "shlproto://foo/bar.lnk"); /* Neither does a .exe extension */ rc = shell_execute(NULL, "shlproto://foo/bar.exe", NULL, NULL); -- 1.9.1

1 0

[PATCH 1/2] shell32: Expand environment strings in ShellExecute
by Alistair Leslie-Hughes 16 Oct '18

16 Oct '18

From: Mark Jansen <learn0more+wine(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlexec.c | 47 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlexec.c | 6 +++--- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 40306d6..0b794b0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1557,6 +1557,26 @@ static void do_error_dialog( UINT_PTR retval, HWND hwnd ) MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } +static WCHAR *expand_environment( const WCHAR *str ) +{ + WCHAR *buf; + DWORD len; + + len = ExpandEnvironmentStringsW(str, NULL, 0); + if (!len) return NULL; + + buf = heap_alloc(len * sizeof(WCHAR)); + if (!buf) return NULL; + + len = ExpandEnvironmentStringsW(str, buf, len); + if (!len) + { + heap_free(buf); + return NULL; + } + return buf; +} + /************************************************************************* * SHELL_execute [Internal] */ @@ -1570,7 +1590,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; - WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd; + WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL; DWORD dwApplicationNameLen = MAX_PATH+2; DWORD parametersLen = ARRAY_SIZE(parametersBuffer); DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer); @@ -1676,6 +1696,30 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } + if (sei_tmp.fMask & SEE_MASK_DOENVSUBST) + { + WCHAR *tmp; + + tmp = expand_environment(sei_tmp.lpFile); + if (!tmp) + { + retval = SE_ERR_OOM; + goto end; + } + heap_free(wszApplicationName); + sei_tmp.lpFile = wszApplicationName = tmp; + + tmp = expand_environment(sei_tmp.lpDirectory); + if (!tmp) + { + retval = SE_ERR_OOM; + goto end; + } + if (wszDir != dirBuffer) + heap_free(wszDir); + sei_tmp.lpDirectory = wszDir = tmp; + } + if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) ) { sei->hInstApp = (HINSTANCE) 33; @@ -1846,6 +1890,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0); } +end: TRACE("retval %lu\n", retval); heap_free(wszApplicationName); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ab77fa1..bb2b842 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2133,13 +2133,13 @@ static void test_lnks(void) get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); - todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); okShell(rc > 32, "failed: rc=%lu err=%u\n", rc, GetLastError()); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); + okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); - todo_wine okChildPath("argvA4", filename); + okChildPath("argvA4", filename); } /* Should just run our executable */ -- 1.9.1

1 0

[PATCH v4] gdi32: Support the gamma correction for the subpixel rendering.
by Byeongsik Jeon 15 Oct '18

15 Oct '18

By setting the appropriate gamma value, the subpixel rendering color fringing reduced. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#F… v2: Fix the void *, thread safety. v3: Fix the wrong patch send. v4: Fix the memory leaks (dc->font_gamma = NULL; removed ). Use the 'struct font_intensities' instead of 'union font_intensities'. Move the 'struct font_gamma_ramp' to the dibdrv.h. Add the '1000 * gamma / 1400' line. dlls/gdi32/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 15 ++++++++++- dlls/gdi32/dibdrv/graphics.c | 40 ++++++++++++++++++++++----- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 30 +++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 +++ 6 files changed, 118 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..8ee8a52d94 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -168,6 +168,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); + HeapFree( GetProcessHeap(), 0, dc->font_gamma_ramp ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..65305e5394 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,19 @@ struct intensity_range BYTE b_min, b_max; }; +struct font_gamma_ramp +{ + DWORD gamma; + BYTE encode[256]; + BYTE decode[256]; +}; + +struct font_intensities +{ + struct intensity_range aa_ranges[17]; + struct font_gamma_ramp *gamma_ramp; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +205,7 @@ typedef struct primitive_funcs void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ); + const POINT *origin, DWORD text_pixel, const struct font_gamma_ramp *gamma); DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..0070dae75a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -520,6 +520,26 @@ static inline void get_aa_ranges( COLORREF col, struct intensity_range intensiti } } +static void update_font_gamma_ramp( DC *dc ) +{ + const DWORD gamma = dc->font_gamma; + struct font_gamma_ramp *ramp = dc->font_gamma_ramp; + int i; + + if ( ramp == NULL ) + ramp = HeapAlloc( GetProcessHeap(), 0, sizeof( struct font_gamma_ramp ) ); + if ( ramp == NULL ) return; + + for ( i = 0; i < 256; i++ ) + { + ramp->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + ramp->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + ramp->gamma = gamma; + + dc->font_gamma_ramp = ramp; +} + static DWORD font_cache_hash( struct cached_font *font ) { DWORD hash = 0, *ptr, two_chars; @@ -683,7 +703,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, + const struct font_intensities *lut, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; @@ -705,10 +725,10 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics if (glyph_dib->bit_count == 32) dib->funcs->draw_subpixel_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color ); + text_color, lut->gamma_ramp ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, lut->aa_ranges ); } } } @@ -816,7 +836,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT struct cached_glyph *glyph; dib_info glyph_dib; DWORD text_color; - struct intensity_range ranges[17]; + struct font_intensities lut; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +846,14 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) - get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + if ( glyph_dib.bit_count == 32 ) + { + if ( !dc->font_gamma_ramp || dc->font_gamma != dc->font_gamma_ramp->gamma ) + update_font_gamma_ramp( dc ); + lut.gamma_ramp = dc->font_gamma_ramp; + } + else + get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), lut.aa_ranges ); for (i = 0; i < count; i++) { @@ -841,7 +867,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, &lut, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..91b60538f7 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6272,16 +6272,35 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in { return; } +static inline BYTE blend_color_gamma( BYTE dst, BYTE text, BYTE alpha, + const struct font_gamma_ramp *gamma_ramp ) +{ + if ( alpha == 0 ) return dst; + if ( alpha == 255 ) return text; + if ( dst == text ) return dst; + + return gamma_ramp->encode[ blend_color( gamma_ramp->decode[dst], + gamma_ramp->decode[text], + alpha) ]; +} -static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha, + const struct font_gamma_ramp *gamma_ramp ) { + if ( gamma_ramp != NULL && gamma_ramp->gamma != 1000 ) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma_ramp ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma_ramp ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma_ramp ); + } return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 | blend_color( b, text, (BYTE) alpha ); } static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6292,7 +6311,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con for (x = 0; x < rect->right - rect->left; x++) { if (glyph_ptr[x] == 0) continue; - dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, glyph_ptr[x] ); + dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x], gamma_ramp ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride / 4; @@ -6300,7 +6320,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con } static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6319,7 +6340,7 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], gamma_ramp ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6328,7 +6349,8 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6341,7 +6363,7 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const { if (glyph_ptr[x] == 0) continue; val = blend_subpixel( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, glyph_ptr[x] ); + text_pixel, glyph_ptr[x], gamma_ramp ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6352,7 +6374,8 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6371,7 +6394,7 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons val = blend_subpixel( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6380,7 +6403,8 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons } static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6399,7 +6423,7 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6408,7 +6432,8 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_ramp *gamma_ramp ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..238eb51717 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,34 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static DWORD get_font_gamma_value( void ) +{ + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; + static const WCHAR smoothing_gamma[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', + 'G','a','m','m','a',0}; + const DWORD gamma_default = 1400; + DWORD gamma; + HKEY key; + + gamma = gamma_default; + if ( RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS ) + { + if ( get_key_value( key, smoothing_gamma, &gamma ) || gamma == 0 ) + gamma = gamma_default; + RegCloseKey( key ); + + gamma = min( max( gamma, 1000), 2200 ); + TRACE( "font_gamma %d\n", gamma ); + } + + /* Calibration the difference between the registry value and the Wine gamma value. + This shows a similar looks to the Windows Native for the same registry value.*/ + gamma = 1000 * gamma / 1400; + + return gamma; +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +782,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); + if ( dc->font_gamma == 0 ) + dc->font_gamma = get_font_gamma_value(); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b84846..fe88c66a2b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,9 @@ typedef struct tagDC struct gdi_path *path; + DWORD font_gamma; + struct font_gamma_ramp *font_gamma_ramp; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; -- 2.19.1

1 0

[PATCH v2] xaudio2: Don't return XAudio28 interface for XAudio2[0..7] objects in QueryInterface()
by Roger Zoellner 15 Oct '18

15 Oct '18

Supercedes: https://source.winehq.org/patches/data/152523 Includes a test case. Signed-off-by: Roger Zoellner <zoellner.roger(a)gmail.com> --- dlls/xaudio2_7/tests/xaudio2.c | 3 +++ dlls/xaudio2_7/xaudio_dll.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 66097532c5..0c1d9a7805 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1273,6 +1273,9 @@ START_TEST(xaudio2) if(hr == S_OK){ xaudio27 = TRUE; + hr = IXAudio27_QueryInterface(xa27, &IID_IXAudio28, (void**) &xa); + ok(hr != S_OK, "QueryInterface with IID_IXAudio28 on IXAudio27 object returned success. Expected to fail\n"); + hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR); ok(hr == S_OK, "Initialize failed: %08x\n", hr); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 28cf98565b..461ac56ffe 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1262,7 +1262,9 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); if(IsEqualGUID(riid, &IID_IUnknown) || +#if XAUDIO2_VER == 8 IsEqualGUID(riid, &IID_IXAudio28) || +#endif IsEqualGUID(riid, &IID_IXAudio2)) *ppvObject = &This->IXAudio2_iface; else if(IsEqualGUID(riid, &IID_IXAudio27)){ -- 2.19.0

2 1

[PATCH] ddraw: Allow GPU access to D3DVBCAPS_SYSTEMMEMORY vertex buffers.
by Matteo Bruni 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45279 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- The original Deus Ex uses a D3DVBCAPS_SYSTEMMEMORY buffer with DrawPrimitiveVB() and expects it to work. It should also help with bug 45279 and 45486. The device is probably created with D3DCREATE_SOFTWARE_VERTEXPROCESSING, which would explain why this is accepted on Windows. With core profile we need to create a VBO anyway so I think this is the correct fix in practice. This is an alternative to https://source.winehq.org/patches/data/152581, main difference is fixing the issue in ddraw instead of wined3d. dlls/ddraw/vertexbuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 3ad8f7e1bdd..6a1f010bd31 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -125,7 +125,8 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer desc.usage |= WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_GPU + | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; else desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; -- 2.18.1

3 2

[PATCH v2 1/2] wined3d: Add sync object after query buffer issue.
by Andrew Wesie 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45932 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- Notes: As a side effect, fixes a NVIDIA driver bug with many in-flight query buffer objects. dlls/wined3d/query.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 26c32b1f13..4239fc08b3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -76,6 +76,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { const struct wined3d_gl_info *gl_info = context->gl_info; + GLsync tmp_sync; if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) return FALSE; @@ -104,6 +105,14 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); + /* ARB_buffer_storage requires the client to call FenceSync with + * SYNC_GPU_COMMANDS_COMPLETE after the server does a write. This behavior + * is not enforced by Mesa. + */ + tmp_sync = GL_EXTCALL(glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)); + GL_EXTCALL(glDeleteSync(tmp_sync)); + checkGLcall("query buffer sync"); + return TRUE; } -- 2.17.1

3 4

[PATCH 1/8] ddraw/tests: Look for more messages when losing focus.
by Stefan Dösinger 15 Oct '18

15 Oct '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- The only new bit of information here is the WM_KILLFOCUS message. The rest is already covered by the focus loss test, but it is (a) helpful to make the two window changes explicit and (b) it will serve as a place to check the state of the DirectDraw object during the focus loss sequence. --- dlls/ddraw/tests/ddraw1.c | 6 +++++- dlls/ddraw/tests/ddraw2.c | 6 +++++- dlls/ddraw/tests/ddraw4.c | 6 +++++- dlls/ddraw/tests/ddraw7.c | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ee4fa5bfaab..aad7bbff1f4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2447,8 +2447,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9394705330a..29c3c845cb1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2572,8 +2572,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6a3630a2c0e..7cf61cea911 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2713,8 +2713,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5bb2951cee7..6ae4207b34b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2442,8 +2442,12 @@ static void test_coop_level_mode_set(void) static const struct message exclusive_focus_loss_messages[] = { {WM_ACTIVATE, TRUE, WA_INACTIVE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window resize due to mode change. */ + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, TRUE, SIZE_RESTORED}, /* Generated by DefWindowProc. */ {WM_DISPLAYCHANGE, FALSE, 0}, - {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_KILLFOCUS, FALSE, 0}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, /* Window minimized. */ /* Like d3d8 and d3d9 ddraw seems to use SW_SHOWMINIMIZED instead of * SW_MINIMIZED, causing a recursive window activation that does not * produce the same result in Wine yet. Ignore the difference for now. -- 2.18.1

3 21

[PATCH 2/2] kernel32: Fix LCMapString buffer calculation with LCMAP_KATAKANA and LCMAP_HALFWIDTH.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45982 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/locale.c | 10 +++++++++- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] kernel32/tests: Add LCMapString tests with a voiced consonant Hiragana character.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

We use U+3060 (HIRAGANA LETTER DA) in the test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/locale.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)

1 0

[PATCH] wined3d: Force VBOs to be GPU accessible.
by Andrew Wesie 15 Oct '18

15 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45279 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e7b05157cc..247db45bb7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,6 +1399,10 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * (Half-Life 2 and others.) */ dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; + /* We need vertex buffer objects in OpenGL core profiles. Force GPU access. */ + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + access |= WINED3D_RESOURCE_ACCESS_GPU; + if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); -- 2.17.1

2 1

[PATCH] ntdll: Block SIGTRAP during server calls.
by Huw Davies 15 Oct '18

15 Oct '18

This prevents issues with gdbproxy, where gdb adds breakpoints to the dynamic loader which get triggered on thread destruction. It also allows setting a gdb breakpoint in sigaction(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45070 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ec03445..689f0e7 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1399,6 +1399,9 @@ void server_init_process(void) sigaddset( &server_block_set, SIGUSR1 ); sigaddset( &server_block_set, SIGUSR2 ); sigaddset( &server_block_set, SIGCHLD ); +#ifdef SIGTRAP + sigaddset( &server_block_set, SIGTRAP ); +#endif pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ -- 2.7.4

1 1

[PATCH] mscms: add stub for WcsEnumColorProfilesSize
by Louis Lenders 15 Oct '18

15 Oct '18

fixes https://bugs.winehq.org/show_bug.cgi?id=45994 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/mscms/mscms.spec | 2 +- dlls/mscms/profile.c | 10 ++++++++++ include/icm.h | 7 +++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index 9992bf5d21..f521ac6969 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -89,7 +89,7 @@ @ stub WcsCreateIccProfile @ stub WcsDisassociateColorProfileFromDevice @ stub WcsEnumColorProfiles -@ stub WcsEnumColorProfilesSize +@ stdcall WcsEnumColorProfilesSize(long ptr ptr) @ stub WcsGetCalibrationManagementState @ stub WcsGetDefaultColorProfile @ stub WcsGetDefaultColorProfileSize diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 53016ef5ce..039a271482 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1535,3 +1535,13 @@ BOOL WINAPI WcsGetUsePerUserProfiles( const WCHAR* name, DWORD class, BOOL* use_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/****************************************************************************** + * WcsEnumColorProfilesSize [MSCMS.@] + */ +BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTYPEW *record, DWORD *size ) +{ + FIXME( "%d %p %p\n", scope, record, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/include/icm.h b/include/icm.h index 8a666fad5c..fbbdede3ed 100644 --- a/include/icm.h +++ b/include/icm.h @@ -176,6 +176,12 @@ typedef enum BM_16b_GRAY, } BMFORMAT, *PBMFORMAT, *LPBMFORMAT; +typedef enum +{ + WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE, + WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER +} WCS_PROFILE_MANAGEMENT_SCOPE; + typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; @@ -403,6 +409,7 @@ BOOL WINAPI UninstallColorProfileW(PCWSTR,PCWSTR,BOOL); BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) +BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); #define PROFILE_FILENAME 1 -- 2.17.1

2 1

[PATCH v3 1/2] gdi32: Support the subpixel rendering gamma correction.
by Byeongsik Jeon 15 Oct '18

15 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Fix the void *, thread safety. v3: Fix the wrong patch send. dlls/gdi32/dc.c | 2 ++ dlls/gdi32/dibdrv/dibdrv.h | 8 +++++- dlls/gdi32/dibdrv/graphics.c | 19 +++++++++---- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 38 ++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 9 +++++++ 6 files changed, 107 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..de01bf4d3d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -86,6 +86,7 @@ static void set_initial_dc_state( DC *dc ) dc->vport_ext.cy = 1; dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ dc->layout = 0; + dc->font_gamma = NULL; dc->font_code_page = CP_ACP; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; @@ -168,6 +169,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); + HeapFree( GetProcessHeap(), 0, dc->font_gamma ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..5776490bd4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,12 @@ struct intensity_range BYTE b_min, b_max; }; +union font_intensities +{ + struct intensity_range *ranges; + struct font_gamma_table *gamma; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +198,7 @@ typedef struct primitive_funcs void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ); + const POINT *origin, DWORD text_pixel, const struct font_gamma_table *gamma); DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..a6d108576f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -683,7 +683,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, + const union font_intensities lut, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; @@ -705,10 +705,10 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics if (glyph_dib->bit_count == 32) dib->funcs->draw_subpixel_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color ); + text_color, lut.gamma ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, lut.ranges ); } } } @@ -817,6 +817,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT dib_info glyph_dib; DWORD text_color; struct intensity_range ranges[17]; + union font_intensities lut = { NULL }; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +827,16 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) + switch ( glyph_dib.bit_count ) + { + case 8: get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + lut.ranges = ranges; + break; + case 32: + lut.gamma = dc->font_gamma; + break; + } for (i = 0; i < count; i++) { @@ -841,7 +850,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, lut, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..ca80e4d8f6 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6272,16 +6272,35 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in { return; } +static inline BYTE blend_color_gamma( BYTE dst, BYTE text, BYTE alpha, + const struct font_gamma_table *gamma ) +{ + if ( alpha == 0 ) return dst; + if ( alpha == 255 ) return text; + if ( dst == text ) return dst; + + return gamma->encode[ blend_color( gamma->decode[dst], + gamma->decode[text], + alpha) ]; +} -static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha, + const struct font_gamma_table *gamma ) { + if ( gamma != NULL && gamma->value != 1000 ) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma ); + } return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 | blend_color( b, text, (BYTE) alpha ); } static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6292,7 +6311,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con for (x = 0; x < rect->right - rect->left; x++) { if (glyph_ptr[x] == 0) continue; - dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, glyph_ptr[x] ); + dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x], gamma ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride / 4; @@ -6300,7 +6320,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con } static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6319,7 +6340,7 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], gamma ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6328,7 +6349,8 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6341,7 +6363,7 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const { if (glyph_ptr[x] == 0) continue; val = blend_subpixel( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, glyph_ptr[x] ); + text_pixel, glyph_ptr[x], gamma ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6352,7 +6374,8 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6371,7 +6394,7 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons val = blend_subpixel( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6380,7 +6403,8 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons } static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6399,7 +6423,7 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6408,7 +6432,8 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..36e65a4cef 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,42 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static struct font_gamma_table *get_font_gamma_table( void ) +{ + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; + static const WCHAR smoothing_gamma[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', + 'G','a','m','m','a',0}; + struct font_gamma_table *font_gamma; + const DWORD gamma_default = 1000; /* FIXME 1400 */ + DWORD i, gamma; + HKEY key; + + font_gamma = HeapAlloc( GetProcessHeap(), 0, sizeof(struct font_gamma_table) ); + if ( font_gamma == NULL ) return NULL; + + gamma = gamma_default; + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS ) + { + if ( get_key_value( key, smoothing_gamma, &gamma ) || gamma == 0 ) + gamma = gamma_default; + RegCloseKey( key ); + + gamma = min( max( gamma, 1000), 2200 ); + } + + for ( i = 0; i < 256; i++ ) + { + font_gamma->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + font_gamma->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + + font_gamma->value = gamma; + TRACE("font_gamma value %d\n", font_gamma->value); + + return font_gamma; +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +790,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); + if ( dc->font_gamma == NULL ) + dc->font_gamma = get_font_gamma_table(); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b84846..e5ff467b20 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -48,6 +48,13 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +struct font_gamma_table +{ + DWORD value; + BYTE encode[256]; + BYTE decode[256]; +}; + struct gdi_obj_funcs { HGDIOBJ (*pSelectObject)( HGDIOBJ handle, HDC hdc ); @@ -99,6 +106,8 @@ typedef struct tagDC struct gdi_path *path; + struct font_gamma_table *font_gamma; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; -- 2.19.1

1 1

[PATCH v2 1/2] gdi32: Support the subpixel rendering gamma. correction.
by Byeongsik Jeon 15 Oct '18

15 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v2: Fix the void *, thread safety. dlls/gdi32/dc.c | 2 ++ dlls/gdi32/dibdrv/dibdrv.h | 8 +++++- dlls/gdi32/dibdrv/graphics.c | 19 +++++++++---- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 37 +++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 9 +++++++ 6 files changed, 106 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..de01bf4d3d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -86,6 +86,7 @@ static void set_initial_dc_state( DC *dc ) dc->vport_ext.cy = 1; dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ dc->layout = 0; + dc->font_gamma = NULL; dc->font_code_page = CP_ACP; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; @@ -168,6 +169,7 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); + HeapFree( GetProcessHeap(), 0, dc->font_gamma ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..5776490bd4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,12 @@ struct intensity_range BYTE b_min, b_max; }; +union font_intensities +{ + struct intensity_range *ranges; + struct font_gamma_table *gamma; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +198,7 @@ typedef struct primitive_funcs void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ); + const POINT *origin, DWORD text_pixel, const struct font_gamma_table *gamma); DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..a6d108576f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -683,7 +683,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, + const union font_intensities lut, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; @@ -705,10 +705,10 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics if (glyph_dib->bit_count == 32) dib->funcs->draw_subpixel_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color ); + text_color, lut.gamma ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, lut.ranges ); } } } @@ -817,6 +817,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT dib_info glyph_dib; DWORD text_color; struct intensity_range ranges[17]; + union font_intensities lut = { NULL }; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +827,16 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) + switch ( glyph_dib.bit_count ) + { + case 8: get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + lut.ranges = ranges; + break; + case 32: + lut.gamma = dc->font_gamma; + break; + } for (i = 0; i < count; i++) { @@ -841,7 +850,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, lut, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..ca80e4d8f6 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6272,16 +6272,35 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in { return; } +static inline BYTE blend_color_gamma( BYTE dst, BYTE text, BYTE alpha, + const struct font_gamma_table *gamma ) +{ + if ( alpha == 0 ) return dst; + if ( alpha == 255 ) return text; + if ( dst == text ) return dst; + + return gamma->encode[ blend_color( gamma->decode[dst], + gamma->decode[text], + alpha) ]; +} -static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha, + const struct font_gamma_table *gamma ) { + if ( gamma != NULL && gamma->value != 1000 ) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma ); + } return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 | blend_color( b, text, (BYTE) alpha ); } static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6292,7 +6311,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con for (x = 0; x < rect->right - rect->left; x++) { if (glyph_ptr[x] == 0) continue; - dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, glyph_ptr[x] ); + dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x], gamma ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride / 4; @@ -6300,7 +6320,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con } static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6319,7 +6340,7 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], gamma ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6328,7 +6349,8 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6341,7 +6363,7 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const { if (glyph_ptr[x] == 0) continue; val = blend_subpixel( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, glyph_ptr[x] ); + text_pixel, glyph_ptr[x], gamma ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6352,7 +6374,8 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6371,7 +6394,7 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons val = blend_subpixel( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6380,7 +6403,8 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons } static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6399,7 +6423,7 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6408,7 +6432,8 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_table *gamma ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..b943800e1e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,41 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static struct font_gamma_table *get_font_gamma_table() +{ + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; + static const WCHAR smoothing_gamma[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', + 'G','a','m','m','a',0}; + struct font_gamma_table *font_gamma; + const DWORD gamma_default = 1000; /* FIXME 1400 */ + DWORD i, gamma; + HKEY key; + + font_gamma = HeapAlloc( GetProcessHeap(), 0, sizeof(struct font_gamma_table) ); + if ( font_gamma == NULL ) return NULL; + + gamma = gamma_default; + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS ) + { + if ( get_key_value( key, smoothing_gamma, &gamma ) || gamma == 0 ) + gamma = gamma_default; + RegCloseKey( key ); + + gamma = min( max( gamma, 1000), 2200 ); + } + + for ( i = 0; i < 256; i++ ) + { + font_gamma->encode[i] = pow( i / 255., 1000. / gamma ) * 255. + .5; + font_gamma->decode[i] = pow( i / 255., gamma / 1000. ) * 255. + .5; + } + + font_gamma->value = gamma; + + TRACE("font_gamma value %d\n", font_gamma->value); +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +789,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); + if ( dc->font_gamma == NULL ) + dc->font_gamma = get_font_gamma_table(); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b84846..e5ff467b20 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -48,6 +48,13 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +struct font_gamma_table +{ + DWORD value; + BYTE encode[256]; + BYTE decode[256]; +}; + struct gdi_obj_funcs { HGDIOBJ (*pSelectObject)( HGDIOBJ handle, HDC hdc ); @@ -99,6 +106,8 @@ typedef struct tagDC struct gdi_path *path; + struct font_gamma_table *font_gamma; + UINT font_code_page; WORD ROPmode; WORD polyFillMode; -- 2.19.1

1 1

[PATCH v4 1/7] shell32/autocomplete: Fix handling of Return key when an auto-suggestion item is selected
by Gabriel Ivăncescu 15 Oct '18

15 Oct '18

When selecting an item from the AutoComplete's listbox, the Return key should act the same as a left click on it (place the text, select it, and hide the listbox). This matches Windows behavior. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes the remaining series from 150642. Also fixes quickComplete since a VK_RETURN is sent as a WM_CHAR of '\n' when CTRL is pressed and it must not be forwarded in WM_CHAR. Furthermore, we have to process this in WM_KEYDOWN to ensure correct behavior. The problem isn't the autocompletion here, but rather the edit control, which must not receive that character at all. no_fwd_char is also needed for future patches (and even the next patch) to suppress forwarding the respective char from the KeyDown (for example, when ACO_USETAB will be implemented). dlls/shell32/autocomplete.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5cf63fe..a342986 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -77,6 +77,7 @@ typedef struct WCHAR *quickComplete; IEnumString *enumstr; AUTOCOMPLETEOPTIONS options; + UCHAR no_fwd_char; } IAutoCompleteImpl; enum autoappend_flag @@ -134,6 +135,34 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st return dst - base; } +static BOOL select_item_with_return_key(IAutoCompleteImpl *ac, HWND hwnd) +{ + WCHAR *text; + HWND hwndListBox = ac->hwndListBox; + if (!(ac->options & ACO_AUTOSUGGEST)) + return FALSE; + + if (IsWindowVisible(hwndListBox)) + { + INT sel = SendMessageW(hwndListBox, LB_GETCURSEL, 0, 0); + if (sel >= 0) + { + UINT len = SendMessageW(hwndListBox, LB_GETTEXTLEN, sel, 0); + if ((text = heap_alloc((len + 1) * sizeof(WCHAR)))) + { + len = SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)text); + set_text_and_selection(ac, hwnd, text, 0, len); + ShowWindow(hwndListBox, SW_HIDE); + ac->no_fwd_char = '\r'; /* RETURN char */ + heap_free(text); + return TRUE; + } + } + } + ShowWindow(hwndListBox, SW_HIDE); + return FALSE; +} + static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) { INT count = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); @@ -324,6 +353,8 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT WCHAR *text, *buf; size_t sz; UINT len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + ac->no_fwd_char = '\n'; /* CTRL+RETURN char */ + if (!(text = heap_alloc((len + 1) * sizeof(WCHAR)))) return 0; len = SendMessageW(hwnd, WM_GETTEXT, len + 1, (LPARAM)text); @@ -342,8 +373,8 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT return 0; } - if (ac->options & ACO_AUTOSUGGEST) - ShowWindow(ac->hwndListBox, SW_HIDE); + if (select_item_with_return_key(ac, hwnd)) + return 0; break; case VK_UP: case VK_DOWN: @@ -375,6 +406,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT return ret; } } + ac->no_fwd_char = '\0'; return CallWindowProcW(ac->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } @@ -404,6 +436,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR: case WM_UNICHAR: + if (wParam == This->no_fwd_char) return 0; + This->no_fwd_char = '\0'; + /* Don't autocomplete at all on most control characters */ if (iscntrlW(wParam) && !(wParam >= '\b' && wParam <= '\r')) break; -- 1.9.1

3 22

[PATCH] kernel32: add stub for MoveFileTransacted{A,W}
by Louis Lenders 15 Oct '18

15 Oct '18

fixes https://bugs.winehq.org/show_bug.cgi?id=45995 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 19 +++++++++++++++++++ include/winbase.h | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e17ee975f7..52120dd143 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1088,8 +1088,8 @@ @ stdcall MoveFileA(str str) @ stdcall MoveFileExA(str str long) @ stdcall MoveFileExW(wstr wstr long) -# @ stub MoveFileTransactedA -# @ stub MoveFileTransactedW +@ stdcall MoveFileTransactedA(str str ptr ptr long ptr) +@ stdcall MoveFileTransactedW(wstr wstr ptr ptr long ptr) @ stdcall MoveFileW(wstr wstr) @ stdcall MoveFileWithProgressA(str str ptr ptr long) @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 48a3e336ec..c5da46c3b8 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1268,6 +1268,25 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename, return ret; } +/************************************************************************** + * MoveFileTransactedA (KERNEL32.@) + */ +BOOL WINAPI MoveFileTransactedA(const char *source, const char *dest, LPPROGRESS_ROUTINE progress, VOID *data, DWORD flags, HANDLE handle) +{ + FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_a(source), debugstr_a(dest), progress, data, flags, handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/************************************************************************** + * MoveFileTransactedW (KERNEL32.@) + */ +BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUTINE progress, VOID *data, DWORD flags, HANDLE handle) +{ + FIXME("(%s, %s, %p, %p, %d, %p)\n", debugstr_w(source), debugstr_w(dest), progress, data, flags, handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /************************************************************************** * MoveFileWithProgressW (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index ea450e1ce7..db155de4fb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2425,6 +2425,9 @@ WINBASEAPI BOOL WINAPI MoveFileW(LPCWSTR,LPCWSTR); WINBASEAPI BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD); WINBASEAPI BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD); #define MoveFileEx WINELIB_NAME_AW(MoveFileEx) +WINBASEAPI BOOL WINAPI MoveFileTransactedA(const char*,const char*,LPPROGRESS_ROUTINE,VOID*,DWORD,HANDLE); +WINBASEAPI BOOL WINAPI MoveFileTransactedW(const WCHAR*,const WCHAR*,LPPROGRESS_ROUTINE,VOID*,DWORD,HANDLE); +#define MoveFileTransacted WINELIB_NAME_AW(MoveFiletransacted) WINBASEAPI BOOL WINAPI MoveFileWithProgressA(LPCSTR,LPCSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); WINBASEAPI BOOL WINAPI MoveFileWithProgressW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); #define MoveFileWithProgress WINELIB_NAME_AW(MoveFileWithProgress) -- 2.17.1

1 0

[Bugzilla] Add Changed column to Regressions page.
by Andrey Gusev 15 Oct '18

15 Oct '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index fd0de99..453bf70 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc,changeddate&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=patch&keywords_type=anywords">With patch</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index d60c46a..7934785 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,7 +150,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc,changeddate&keywords=regression&keywords_type=anywords">Regressions</a> Bugs introduced as result of a regression. </li> -- 2.17.2

1 0

[PATCH 3/3] server: Support NamedPipeState in FilePipeLocalInformation.
by Jacek Caban 15 Oct '18

15 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 -- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)

2 1

[PATCH 2/3] server: Use pipe_end_get_file_info for FilePipeInformation implementation.
by Jacek Caban 15 Oct '18

15 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 20 +------------------ server/named_pipe.c | 56 ++++++++++++++++++++++------------------------------- server/protocol.def | 12 ------------ 3 files changed, 24 insertions(+), 64 deletions(-)

2 1

[PATCH 1/3] server: Use pipe_end_get_file_info for FilePipeLocalInformation implementation.
by Jacek Caban 15 Oct '18

15 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 41 +++-------------------------------------- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 51 insertions(+), 45 deletions(-)

1 0

[PATCH 3/3] [v2] gdi32: Adjust destination coordinates in some special cases.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

When the source rectangle needs to flip and it doesn't fit in the source device area, the destination image is flipped but the destination area isn't flipped. GdiAlphaBlend doesn't support mirroring, the above isn't applicable. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/bitblt.c | 26 ++++++++++++++++++++++---- dlls/gdi32/tests/bitmap.c | 6 +++--- 2 files changed, 25 insertions(+), 7 deletions(-)

2 1

[PATCH 2/3] [v2] gdi32: Fix negative width/height handling in stretch bitblt family.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

In v2, remove todo_wine keyword from GdiAlphaBlend test. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/bitblt.c | 26 ++++++++++++++------------ dlls/gdi32/tests/bitmap.c | 3 +-- 2 files changed, 15 insertions(+), 14 deletions(-)

2 1

[PATCH 1/3] [v2] gdi32/tests: Add more stretch bitblt tests.
by Akihiro Sagawa 15 Oct '18

15 Oct '18

In v2, add StretchDIBits tests and update a log message. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)

2 1

[PATCH 1/3] winevulkan: Remove duplicate format_string in make_vulkan
by janisozaur＠gmail.com 15 Oct '18

15 Oct '18

From: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/winevulkan/make_vulkan | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ec861bda7d..375614a4d4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1332,9 +1332,6 @@ class VkParam(object): return self._direction - def format_string(self): - return self.format_str - def dispatch_table(self): """ Return functions dispatch table pointer for dispatchable objects. """ -- 2.19.1

3 8

[PATCH] winevulkan: Update vk.xml to 1.1.88.
by Józef Kucia 15 Oct '18

15 Oct '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 9 +- dlls/winevulkan/vulkan_thunks.c | 46 ++++++++ dlls/winevulkan/vulkan_thunks.h | 12 +++ include/wine/vulkan.h | 183 ++++++++++++++++++++++---------- 4 files changed, 193 insertions(+), 57 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e96645d74588..65ea2ef71799 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.1.86" +VK_XML_VERSION = "1.1.88" WINE_VK_VERSION = (1, 0) # Filenames to create. @@ -99,10 +99,12 @@ BLACKLISTED_EXTENSIONS = [ # plumbing down to the native layer, we will get each message twice as we # use 2 loaders (win32+native), but we may get output from the driver. # In any case callback conversion is required. + "VK_EXT_calibrated_timestamps", "VK_EXT_debug_report", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_external_memory_dma_buf", # Linux specific "VK_EXT_hdr_metadata", # Needs WSI work. + "VK_EXT_image_drm_format_modifier", "VK_GOOGLE_display_timing", "VK_KHR_display", # Needs WSI work. "VK_KHR_external_fence", @@ -1673,13 +1675,14 @@ class VkStruct(Sequence): def needs_struct_extensions_conversion(self): """ Checks if structure extensions in pNext chain need conversion. """ + ret = False for e in self.struct_extensions: if e.required and e.needs_conversion(): LOGGER.error("Unhandled pNext chain conversion for {0}".format(e.name)) - return True + ret = True - return False + return ret def set_type_info(self, types): """ Helper function to set type information from the type registry. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 8d7249e1c514..04a76955884c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1325,6 +1325,12 @@ void WINAPI wine_vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool quer commandBuffer->device->funcs.p_vkCmdBeginQuery(commandBuffer->command_buffer, queryPool, query, flags); } +static void WINAPI wine_vkCmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index) +{ + TRACE("%p, 0x%s, %u, %#x, %u\n", commandBuffer, wine_dbgstr_longlong(queryPool), query, flags, index); + commandBuffer->device->funcs.p_vkCmdBeginQueryIndexedEXT(commandBuffer->command_buffer, queryPool, query, flags, index); +} + void WINAPI wine_vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkSubpassContents contents) { #if defined(USE_STRUCT_CONVERSION) @@ -1355,6 +1361,12 @@ static void WINAPI wine_vkCmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, #endif } +static void WINAPI wine_vkCmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets) +{ + TRACE("%p, %u, %u, %p, %p\n", commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets); + commandBuffer->device->funcs.p_vkCmdBeginTransformFeedbackEXT(commandBuffer->command_buffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets); +} + void WINAPI wine_vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t *pDynamicOffsets) { TRACE("%p, %#x, 0x%s, %u, %u, %p, %u, %p\n", commandBuffer, pipelineBindPoint, wine_dbgstr_longlong(layout), firstSet, descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); @@ -1379,6 +1391,12 @@ static void WINAPI wine_vkCmdBindShadingRateImageNV(VkCommandBuffer commandBuffe commandBuffer->device->funcs.p_vkCmdBindShadingRateImageNV(commandBuffer->command_buffer, imageView, imageLayout); } +static void WINAPI wine_vkCmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes) +{ + TRACE("%p, %u, %u, %p, %p, %p\n", commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes); + commandBuffer->device->funcs.p_vkCmdBindTransformFeedbackBuffersEXT(commandBuffer->command_buffer, firstBinding, bindingCount, pBuffers, pOffsets, pSizes); +} + void WINAPI wine_vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets) { TRACE("%p, %u, %u, %p, %p\n", commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets); @@ -1529,6 +1547,12 @@ void WINAPI wine_vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffe commandBuffer->device->funcs.p_vkCmdDrawIndirect(commandBuffer->command_buffer, buffer, offset, drawCount, stride); } +static void WINAPI wine_vkCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride) +{ + TRACE("%p, %u, %u, 0x%s, 0x%s, %u, %u\n", commandBuffer, instanceCount, firstInstance, wine_dbgstr_longlong(counterBuffer), wine_dbgstr_longlong(counterBufferOffset), counterOffset, vertexStride); + commandBuffer->device->funcs.p_vkCmdDrawIndirectByteCountEXT(commandBuffer->command_buffer, instanceCount, firstInstance, counterBuffer, counterBufferOffset, counterOffset, vertexStride); +} + static void WINAPI wine_vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) { TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride); @@ -1571,6 +1595,12 @@ void WINAPI wine_vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryP commandBuffer->device->funcs.p_vkCmdEndQuery(commandBuffer->command_buffer, queryPool, query); } +static void WINAPI wine_vkCmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index) +{ + TRACE("%p, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(queryPool), query, index); + commandBuffer->device->funcs.p_vkCmdEndQueryIndexedEXT(commandBuffer->command_buffer, queryPool, query, index); +} + void WINAPI wine_vkCmdEndRenderPass(VkCommandBuffer commandBuffer) { TRACE("%p\n", commandBuffer); @@ -1583,6 +1613,12 @@ static void WINAPI wine_vkCmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, co commandBuffer->device->funcs.p_vkCmdEndRenderPass2KHR(commandBuffer->command_buffer, pSubpassEndInfo); } +static void WINAPI wine_vkCmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets) +{ + TRACE("%p, %u, %u, %p, %p\n", commandBuffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets); + commandBuffer->device->funcs.p_vkCmdEndTransformFeedbackEXT(commandBuffer->command_buffer, firstCounterBuffer, counterBufferCount, pCounterBuffers, pCounterBufferOffsets); +} + void WINAPI wine_vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) { TRACE("%p, 0x%s, 0x%s, 0x%s, %u\n", commandBuffer, wine_dbgstr_longlong(dstBuffer), wine_dbgstr_longlong(dstOffset), wine_dbgstr_longlong(size), data); @@ -2949,12 +2985,15 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkBindImageMemory2KHR", &wine_vkBindImageMemory2KHR}, {"vkCmdBeginConditionalRenderingEXT", &wine_vkCmdBeginConditionalRenderingEXT}, {"vkCmdBeginQuery", &wine_vkCmdBeginQuery}, + {"vkCmdBeginQueryIndexedEXT", &wine_vkCmdBeginQueryIndexedEXT}, {"vkCmdBeginRenderPass", &wine_vkCmdBeginRenderPass}, {"vkCmdBeginRenderPass2KHR", &wine_vkCmdBeginRenderPass2KHR}, + {"vkCmdBeginTransformFeedbackEXT", &wine_vkCmdBeginTransformFeedbackEXT}, {"vkCmdBindDescriptorSets", &wine_vkCmdBindDescriptorSets}, {"vkCmdBindIndexBuffer", &wine_vkCmdBindIndexBuffer}, {"vkCmdBindPipeline", &wine_vkCmdBindPipeline}, {"vkCmdBindShadingRateImageNV", &wine_vkCmdBindShadingRateImageNV}, + {"vkCmdBindTransformFeedbackBuffersEXT", &wine_vkCmdBindTransformFeedbackBuffersEXT}, {"vkCmdBindVertexBuffers", &wine_vkCmdBindVertexBuffers}, {"vkCmdBlitImage", &wine_vkCmdBlitImage}, {"vkCmdClearAttachments", &wine_vkCmdClearAttachments}, @@ -2975,6 +3014,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdDrawIndexedIndirectCountAMD", &wine_vkCmdDrawIndexedIndirectCountAMD}, {"vkCmdDrawIndexedIndirectCountKHR", &wine_vkCmdDrawIndexedIndirectCountKHR}, {"vkCmdDrawIndirect", &wine_vkCmdDrawIndirect}, + {"vkCmdDrawIndirectByteCountEXT", &wine_vkCmdDrawIndirectByteCountEXT}, {"vkCmdDrawIndirectCountAMD", &wine_vkCmdDrawIndirectCountAMD}, {"vkCmdDrawIndirectCountKHR", &wine_vkCmdDrawIndirectCountKHR}, {"vkCmdDrawMeshTasksIndirectCountNV", &wine_vkCmdDrawMeshTasksIndirectCountNV}, @@ -2982,8 +3022,10 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkCmdDrawMeshTasksNV", &wine_vkCmdDrawMeshTasksNV}, {"vkCmdEndConditionalRenderingEXT", &wine_vkCmdEndConditionalRenderingEXT}, {"vkCmdEndQuery", &wine_vkCmdEndQuery}, + {"vkCmdEndQueryIndexedEXT", &wine_vkCmdEndQueryIndexedEXT}, {"vkCmdEndRenderPass", &wine_vkCmdEndRenderPass}, {"vkCmdEndRenderPass2KHR", &wine_vkCmdEndRenderPass2KHR}, + {"vkCmdEndTransformFeedbackEXT", &wine_vkCmdEndTransformFeedbackEXT}, {"vkCmdExecuteCommands", &wine_vkCmdExecuteCommands}, {"vkCmdFillBuffer", &wine_vkCmdFillBuffer}, {"vkCmdNextSubpass", &wine_vkCmdNextSubpass}, @@ -3223,6 +3265,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_discard_rectangles", "VK_EXT_global_priority", "VK_EXT_inline_uniform_block", + "VK_EXT_pci_bus_info", "VK_EXT_post_depth_coverage", "VK_EXT_sample_locations", "VK_EXT_sampler_filter_minmax", @@ -3230,8 +3273,11 @@ static const char * const vk_device_extensions[] = "VK_EXT_shader_subgroup_ballot", "VK_EXT_shader_subgroup_vote", "VK_EXT_shader_viewport_index_layer", + "VK_EXT_transform_feedback", "VK_EXT_validation_cache", "VK_EXT_vertex_attribute_divisor", + "VK_GOOGLE_decorate_string", + "VK_GOOGLE_hlsl_functionality1", "VK_IMG_filter_cubic", "VK_IMG_format_pvrtc", "VK_KHR_16bit_storage", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 38c45386c747..32d429033ea9 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -701,6 +701,7 @@ struct vulkan_device_funcs void (*p_vkCmdBeginConditionalRenderingEXT)(VkCommandBuffer, const VkConditionalRenderingBeginInfoEXT *); #endif void (*p_vkCmdBeginQuery)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags); + void (*p_vkCmdBeginQueryIndexedEXT)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags, uint32_t); #if defined(USE_STRUCT_CONVERSION) void (*p_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, VkSubpassContents); #else @@ -711,10 +712,12 @@ struct vulkan_device_funcs #else void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfoKHR *); #endif + void (*p_vkCmdBeginTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); void (*p_vkCmdBindDescriptorSets)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkDescriptorSet *, uint32_t, const uint32_t *); void (*p_vkCmdBindIndexBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkIndexType); void (*p_vkCmdBindPipeline)(VkCommandBuffer, VkPipelineBindPoint, VkPipeline); void (*p_vkCmdBindShadingRateImageNV)(VkCommandBuffer, VkImageView, VkImageLayout); + void (*p_vkCmdBindTransformFeedbackBuffersEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *); void (*p_vkCmdBindVertexBuffers)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); void (*p_vkCmdBlitImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageBlit *, VkFilter); void (*p_vkCmdClearAttachments)(VkCommandBuffer, uint32_t, const VkClearAttachment *, uint32_t, const VkClearRect *); @@ -747,6 +750,7 @@ struct vulkan_device_funcs void (*p_vkCmdDrawIndexedIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t); + void (*p_vkCmdDrawIndirectByteCountEXT)(VkCommandBuffer, uint32_t, uint32_t, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); void (*p_vkCmdDrawMeshTasksIndirectCountNV)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); @@ -754,8 +758,10 @@ struct vulkan_device_funcs void (*p_vkCmdDrawMeshTasksNV)(VkCommandBuffer, uint32_t, uint32_t); void (*p_vkCmdEndConditionalRenderingEXT)(VkCommandBuffer); void (*p_vkCmdEndQuery)(VkCommandBuffer, VkQueryPool, uint32_t); + void (*p_vkCmdEndQueryIndexedEXT)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t); void (*p_vkCmdEndRenderPass)(VkCommandBuffer); void (*p_vkCmdEndRenderPass2KHR)(VkCommandBuffer, const VkSubpassEndInfoKHR *); + void (*p_vkCmdEndTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); void (*p_vkCmdExecuteCommands)(VkCommandBuffer, uint32_t, const VkCommandBuffer *); void (*p_vkCmdFillBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t); void (*p_vkCmdNextSubpass)(VkCommandBuffer, VkSubpassContents); @@ -1090,12 +1096,15 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkBindImageMemory2KHR) \ USE_VK_FUNC(vkCmdBeginConditionalRenderingEXT) \ USE_VK_FUNC(vkCmdBeginQuery) \ + USE_VK_FUNC(vkCmdBeginQueryIndexedEXT) \ USE_VK_FUNC(vkCmdBeginRenderPass) \ USE_VK_FUNC(vkCmdBeginRenderPass2KHR) \ + USE_VK_FUNC(vkCmdBeginTransformFeedbackEXT) \ USE_VK_FUNC(vkCmdBindDescriptorSets) \ USE_VK_FUNC(vkCmdBindIndexBuffer) \ USE_VK_FUNC(vkCmdBindPipeline) \ USE_VK_FUNC(vkCmdBindShadingRateImageNV) \ + USE_VK_FUNC(vkCmdBindTransformFeedbackBuffersEXT) \ USE_VK_FUNC(vkCmdBindVertexBuffers) \ USE_VK_FUNC(vkCmdBlitImage) \ USE_VK_FUNC(vkCmdClearAttachments) \ @@ -1116,6 +1125,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdDrawIndexedIndirectCountAMD) \ USE_VK_FUNC(vkCmdDrawIndexedIndirectCountKHR) \ USE_VK_FUNC(vkCmdDrawIndirect) \ + USE_VK_FUNC(vkCmdDrawIndirectByteCountEXT) \ USE_VK_FUNC(vkCmdDrawIndirectCountAMD) \ USE_VK_FUNC(vkCmdDrawIndirectCountKHR) \ USE_VK_FUNC(vkCmdDrawMeshTasksIndirectCountNV) \ @@ -1123,8 +1133,10 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkCmdDrawMeshTasksNV) \ USE_VK_FUNC(vkCmdEndConditionalRenderingEXT) \ USE_VK_FUNC(vkCmdEndQuery) \ + USE_VK_FUNC(vkCmdEndQueryIndexedEXT) \ USE_VK_FUNC(vkCmdEndRenderPass) \ USE_VK_FUNC(vkCmdEndRenderPass2KHR) \ + USE_VK_FUNC(vkCmdEndTransformFeedbackEXT) \ USE_VK_FUNC(vkCmdExecuteCommands) \ USE_VK_FUNC(vkCmdFillBuffer) \ USE_VK_FUNC(vkCmdNextSubpass) \ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 1145fa84bd56..d483249f54aa 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -107,6 +107,8 @@ #define VK_AMD_GCN_SHADER_EXTENSION_NAME "VK_AMD_gcn_shader" #define VK_NV_DEDICATED_ALLOCATION_SPEC_VERSION 1 #define VK_NV_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_NV_dedicated_allocation" +#define VK_EXT_TRANSFORM_FEEDBACK_SPEC_VERSION 1 +#define VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME "VK_EXT_transform_feedback" #define VK_AMD_DRAW_INDIRECT_COUNT_SPEC_VERSION 1 #define VK_AMD_DRAW_INDIRECT_COUNT_EXTENSION_NAME "VK_AMD_draw_indirect_count" #define VK_AMD_NEGATIVE_VIEWPORT_HEIGHT_SPEC_VERSION 1 @@ -257,6 +259,12 @@ #define VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME "VK_NV_device_diagnostic_checkpoints" #define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 2 #define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model" +#define VK_EXT_PCI_BUS_INFO_SPEC_VERSION 1 +#define VK_EXT_PCI_BUS_INFO_EXTENSION_NAME "VK_EXT_pci_bus_info" +#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0 +#define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1" +#define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 0 +#define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string" #define VK_MAKE_VERSION(major, minor, patch) \ (((major) << 22) | ((minor) << 12) | (patch)) @@ -265,7 +273,7 @@ #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) -#define VK_HEADER_VERSION 86 +#define VK_HEADER_VERSION 88 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; #define VK_NULL_HANDLE 0 @@ -368,6 +376,7 @@ typedef VkFlags VkGeometryInstanceFlagsNVX; typedef VkFlags VkIOSSurfaceCreateFlagsMVK; typedef VkFlags VkImageAspectFlags; typedef VkFlags VkImageCreateFlags; +typedef VkFlags VkImagePipeSurfaceCreateFlagsFUCHSIA; typedef VkFlags VkImageUsageFlags; typedef VkFlags VkImageViewCreateFlags; typedef VkFlags VkIndirectCommandsLayoutUsageFlagsNVX; @@ -395,6 +404,7 @@ typedef VkFlags VkPipelineLayoutCreateFlags; typedef VkFlags VkPipelineMultisampleStateCreateFlags; typedef VkFlags VkPipelineRasterizationConservativeStateCreateFlagsEXT; typedef VkFlags VkPipelineRasterizationStateCreateFlags; +typedef VkFlags VkPipelineRasterizationStateStreamCreateFlagsEXT; typedef VkFlags VkPipelineShaderStageCreateFlags; typedef VkFlags VkPipelineStageFlags; typedef VkFlags VkPipelineTessellationStateCreateFlags; @@ -451,6 +461,9 @@ typedef enum VkAccessFlagBits VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT = 0x00080000, VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT = 0x00100000, VK_ACCESS_SHADING_RATE_IMAGE_READ_BIT_NV = 0x00800000, + VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT = 0x02000000, + VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT = 0x04000000, + VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT = 0x08000000, VK_ACCESS_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkAccessFlagBits; @@ -595,6 +608,8 @@ typedef enum VkBufferUsageFlagBits VK_BUFFER_USAGE_VERTEX_BUFFER_BIT = 0x00000080, VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT = 0x00000100, VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT = 0x00000200, + VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT = 0x00000800, + VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT = 0x00001000, VK_BUFFER_USAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkBufferUsageFlagBits; @@ -1411,6 +1426,7 @@ typedef enum VkPipelineStageFlagBits VK_PIPELINE_STAGE_TASK_SHADER_BIT_NV = 0x00080000, VK_PIPELINE_STAGE_MESH_SHADER_BIT_NV = 0x00100000, VK_PIPELINE_STAGE_SHADING_RATE_IMAGE_BIT_NV = 0x00400000, + VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT = 0x01000000, VK_PIPELINE_STAGE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkPipelineStageFlagBits; @@ -1482,6 +1498,7 @@ typedef enum VkQueryType VK_QUERY_TYPE_OCCLUSION = 0, VK_QUERY_TYPE_PIPELINE_STATISTICS = 1, VK_QUERY_TYPE_TIMESTAMP = 2, + VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT = 1000028004, VK_QUERY_TYPE_MAX_ENUM = 0x7fffffff, } VkQueryType; @@ -1735,6 +1752,9 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV = 1000026000, VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001, VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT = 1000028000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT = 1000028001, + VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT = 1000028002, VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV = 1000050000, VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO = 1000053000, @@ -1878,6 +1898,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV = 1000206000, VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV = 1000206001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR = 1000211000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT = 1000212000, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7fffffff, } VkStructureType; @@ -2085,14 +2106,6 @@ typedef struct VkBufferMemoryBarrier VkDeviceSize WINE_VK_ALIGN(8) size; } VkBufferMemoryBarrier; -typedef struct VkCheckpointDataNV -{ - VkStructureType sType; - void *pNext; - VkPipelineStageFlagBits stage; - void *pCheckpointMarker; -} VkCheckpointDataNV; - typedef union VkClearColorValue { float float32[4]; @@ -2338,13 +2351,6 @@ typedef struct VkImageMemoryRequirementsInfo2 VkImage WINE_VK_ALIGN(8) image; } VkImageMemoryRequirementsInfo2; -typedef struct VkImagePlaneMemoryRequirementsInfo -{ - VkStructureType sType; - const void *pNext; - VkImageAspectFlagBits planeAspect; -} VkImagePlaneMemoryRequirementsInfo; - typedef struct VkImageSparseMemoryRequirementsInfo2 { VkStructureType sType; @@ -2661,12 +2667,15 @@ typedef struct VkPhysicalDeviceMultiviewProperties uint32_t maxMultiviewInstanceIndex; } VkPhysicalDeviceMultiviewProperties; -typedef struct VkPhysicalDevicePointClippingProperties +typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT { VkStructureType sType; void *pNext; - VkPointClippingBehavior pointClippingBehavior; -} VkPhysicalDevicePointClippingProperties; + uint16_t pciDomain; + uint8_t pciBus; + uint8_t pciDevice; + uint8_t pciFunction; +} VkPhysicalDevicePCIBusInfoPropertiesEXT; typedef struct VkPhysicalDeviceProtectedMemoryProperties { @@ -2730,6 +2739,22 @@ typedef struct VkPhysicalDeviceSparseProperties VkBool32 residencyNonResidentStrict; } VkPhysicalDeviceSparseProperties; +typedef struct VkPhysicalDeviceTransformFeedbackPropertiesEXT +{ + VkStructureType sType; + void *pNext; + uint32_t maxTransformFeedbackStreams; + uint32_t maxTransformFeedbackBuffers; + VkDeviceSize WINE_VK_ALIGN(8) maxTransformFeedbackBufferSize; + uint32_t maxTransformFeedbackStreamDataSize; + uint32_t maxTransformFeedbackBufferDataSize; + uint32_t maxTransformFeedbackBufferDataStride; + VkBool32 transformFeedbackQueries; + VkBool32 transformFeedbackStreamsLinesTriangles; + VkBool32 transformFeedbackRasterizationStreamSelect; + VkBool32 transformFeedbackDraw; +} VkPhysicalDeviceTransformFeedbackPropertiesEXT; + typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT { VkStructureType sType; @@ -2808,12 +2833,13 @@ typedef struct VkPipelineRasterizationStateCreateInfo float lineWidth; } VkPipelineRasterizationStateCreateInfo; -typedef struct VkPipelineRepresentativeFragmentTestStateCreateInfoNV +typedef struct VkPipelineRasterizationStateStreamCreateInfoEXT { VkStructureType sType; const void *pNext; - VkBool32 representativeFragmentTestEnable; -} VkPipelineRepresentativeFragmentTestStateCreateInfoNV; + VkPipelineRasterizationStateStreamCreateFlagsEXT flags; + uint32_t rasterizationStream; +} VkPipelineRasterizationStateStreamCreateInfoEXT; typedef struct VkPipelineTessellationDomainOriginStateCreateInfo { @@ -3107,6 +3133,14 @@ typedef struct VkBufferMemoryRequirementsInfo2 VkBuffer WINE_VK_ALIGN(8) buffer; } VkBufferMemoryRequirementsInfo2; +typedef struct VkCheckpointDataNV +{ + VkStructureType sType; + void *pNext; + VkPipelineStageFlagBits stage; + void *pCheckpointMarker; +} VkCheckpointDataNV; + typedef struct VkClearDepthStencilValue { float depth; @@ -3291,6 +3325,13 @@ typedef struct VkImageMemoryBarrier VkImageSubresourceRange subresourceRange; } VkImageMemoryBarrier; +typedef struct VkImagePlaneMemoryRequirementsInfo +{ + VkStructureType sType; + const void *pNext; + VkImageAspectFlagBits planeAspect; +} VkImagePlaneMemoryRequirementsInfo; + typedef struct VkImageSwapchainCreateInfoKHR { VkStructureType sType; @@ -3397,6 +3438,13 @@ typedef struct VkPhysicalDeviceMeshShaderFeaturesNV VkBool32 meshShader; } VkPhysicalDeviceMeshShaderFeaturesNV; +typedef struct VkPhysicalDevicePointClippingProperties +{ + VkStructureType sType; + void *pNext; + VkPointClippingBehavior pointClippingBehavior; +} VkPhysicalDevicePointClippingProperties; + typedef struct VkPhysicalDeviceProtectedMemoryFeatures { VkStructureType sType; @@ -3444,31 +3492,33 @@ typedef struct VkPhysicalDeviceSubgroupProperties VkBool32 quadOperationsInAllStages; } VkPhysicalDeviceSubgroupProperties; -typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT +typedef struct VkPhysicalDeviceVariablePointerFeatures { VkStructureType sType; void *pNext; - VkBool32 vertexAttributeInstanceRateDivisor; - VkBool32 vertexAttributeInstanceRateZeroDivisor; -} VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT; + VkBool32 variablePointersStorageBuffer; + VkBool32 variablePointers; +} VkPhysicalDeviceVariablePointerFeatures; -typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT +typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR { VkStructureType sType; - const void *pNext; - VkBool32 srcPremultiplied; - VkBool32 dstPremultiplied; - VkBlendOverlapEXT blendOverlap; -} VkPipelineColorBlendAdvancedStateCreateInfoEXT; + void *pNext; + VkBool32 vulkanMemoryModel; + VkBool32 vulkanMemoryModelDeviceScope; +} VkPhysicalDeviceVulkanMemoryModelFeaturesKHR; -typedef struct VkPipelineCoverageToColorStateCreateInfoNV +typedef struct VkPipelineColorBlendStateCreateInfo { VkStructureType sType; const void *pNext; - VkPipelineCoverageToColorStateCreateFlagsNV flags; - VkBool32 coverageToColorEnable; - uint32_t coverageToColorLocation; -} VkPipelineCoverageToColorStateCreateInfoNV; + VkPipelineColorBlendStateCreateFlags flags; + VkBool32 logicOpEnable; + VkLogicOp logicOp; + uint32_t attachmentCount; + const VkPipelineColorBlendAttachmentState *pAttachments; + float blendConstants[4]; +} VkPipelineColorBlendStateCreateInfo; typedef struct VkPipelineInputAssemblyStateCreateInfo { @@ -3488,6 +3538,13 @@ typedef struct VkPipelineRasterizationConservativeStateCreateInfoEXT float extraPrimitiveOverestimationSize; } VkPipelineRasterizationConservativeStateCreateInfoEXT; +typedef struct VkPipelineRepresentativeFragmentTestStateCreateInfoNV +{ + VkStructureType sType; + const void *pNext; + VkBool32 representativeFragmentTestEnable; +} VkPipelineRepresentativeFragmentTestStateCreateInfoNV; + typedef struct VkPipelineViewportCoarseSampleOrderStateCreateInfoNV { VkStructureType sType; @@ -3778,7 +3835,7 @@ typedef struct VkPhysicalDeviceDriverPropertiesKHR { VkStructureType sType; void *pNext; - uint32_t driverID; + VkDriverIdKHR driverID; char driverName[VK_MAX_DRIVER_NAME_SIZE_KHR]; char driverInfo[VK_MAX_DRIVER_INFO_SIZE_KHR]; VkConformanceVersionKHR conformanceVersion; @@ -3931,13 +3988,22 @@ typedef struct VkPhysicalDeviceShaderAtomicInt64FeaturesKHR VkBool32 shaderSharedInt64Atomics; } VkPhysicalDeviceShaderAtomicInt64FeaturesKHR; -typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR +typedef struct VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT { VkStructureType sType; void *pNext; - VkBool32 vulkanMemoryModel; - VkBool32 vulkanMemoryModelDeviceScope; -} VkPhysicalDeviceVulkanMemoryModelFeaturesKHR; + VkBool32 vertexAttributeInstanceRateDivisor; + VkBool32 vertexAttributeInstanceRateZeroDivisor; +} VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT; + +typedef struct VkPipelineCoverageToColorStateCreateInfoNV +{ + VkStructureType sType; + const void *pNext; + VkPipelineCoverageToColorStateCreateFlagsNV flags; + VkBool32 coverageToColorEnable; + uint32_t coverageToColorLocation; +} VkPipelineCoverageToColorStateCreateInfoNV; typedef struct VkPipelineRasterizationStateRasterizationOrderAMD { @@ -4242,13 +4308,13 @@ typedef struct VkPhysicalDeviceSampleLocationsPropertiesEXT VkBool32 variableSampleLocations; } VkPhysicalDeviceSampleLocationsPropertiesEXT; -typedef struct VkPhysicalDeviceVariablePointerFeatures +typedef struct VkPhysicalDeviceTransformFeedbackFeaturesEXT { VkStructureType sType; void *pNext; - VkBool32 variablePointersStorageBuffer; - VkBool32 variablePointers; -} VkPhysicalDeviceVariablePointerFeatures; + VkBool32 transformFeedback; + VkBool32 geometryStreams; +} VkPhysicalDeviceTransformFeedbackFeaturesEXT; typedef struct VkPipelineDiscardRectangleStateCreateInfoEXT { @@ -4595,17 +4661,14 @@ typedef struct VkMemoryBarrier VkAccessFlags dstAccessMask; } VkMemoryBarrier; -typedef struct VkPipelineColorBlendStateCreateInfo +typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT { VkStructureType sType; const void *pNext; - VkPipelineColorBlendStateCreateFlags flags; - VkBool32 logicOpEnable; - VkLogicOp logicOp; - uint32_t attachmentCount; - const VkPipelineColorBlendAttachmentState *pAttachments; - float blendConstants[4]; -} VkPipelineColorBlendStateCreateInfo; + VkBool32 srcPremultiplied; + VkBool32 dstPremultiplied; + VkBlendOverlapEXT blendOverlap; +} VkPipelineColorBlendAdvancedStateCreateInfoEXT; typedef struct VkSubpassDescription { @@ -4702,12 +4765,15 @@ typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory2)(VkDevice, uint32_t, const V typedef VkResult (VKAPI_PTR *PFN_vkBindImageMemory2KHR)(VkDevice, uint32_t, const VkBindImageMemoryInfo *); typedef void (VKAPI_PTR *PFN_vkCmdBeginConditionalRenderingEXT)(VkCommandBuffer, const VkConditionalRenderingBeginInfoEXT *); typedef void (VKAPI_PTR *PFN_vkCmdBeginQuery)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags); +typedef void (VKAPI_PTR *PFN_vkCmdBeginQueryIndexedEXT)(VkCommandBuffer, VkQueryPool, uint32_t, VkQueryControlFlags, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo *, VkSubpassContents); typedef void (VKAPI_PTR *PFN_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfoKHR *); +typedef void (VKAPI_PTR *PFN_vkCmdBeginTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); typedef void (VKAPI_PTR *PFN_vkCmdBindDescriptorSets)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkDescriptorSet *, uint32_t, const uint32_t *); typedef void (VKAPI_PTR *PFN_vkCmdBindIndexBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkIndexType); typedef void (VKAPI_PTR *PFN_vkCmdBindPipeline)(VkCommandBuffer, VkPipelineBindPoint, VkPipeline); typedef void (VKAPI_PTR *PFN_vkCmdBindShadingRateImageNV)(VkCommandBuffer, VkImageView, VkImageLayout); +typedef void (VKAPI_PTR *PFN_vkCmdBindTransformFeedbackBuffersEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *); typedef void (VKAPI_PTR *PFN_vkCmdBindVertexBuffers)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); typedef void (VKAPI_PTR *PFN_vkCmdBlitImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageBlit *, VkFilter); typedef void (VKAPI_PTR *PFN_vkCmdClearAttachments)(VkCommandBuffer, uint32_t, const VkClearAttachment *, uint32_t, const VkClearRect *); @@ -4728,6 +4794,7 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirect)(VkCommandBuffer, VkBuffer typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t); +typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectByteCountEXT)(VkCommandBuffer, uint32_t, uint32_t, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksIndirectCountNV)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t); @@ -4735,8 +4802,10 @@ typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksIndirectNV)(VkCommandBuffer, VkBu typedef void (VKAPI_PTR *PFN_vkCmdDrawMeshTasksNV)(VkCommandBuffer, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdEndConditionalRenderingEXT)(VkCommandBuffer); typedef void (VKAPI_PTR *PFN_vkCmdEndQuery)(VkCommandBuffer, VkQueryPool, uint32_t); +typedef void (VKAPI_PTR *PFN_vkCmdEndQueryIndexedEXT)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass)(VkCommandBuffer); typedef void (VKAPI_PTR *PFN_vkCmdEndRenderPass2KHR)(VkCommandBuffer, const VkSubpassEndInfoKHR *); +typedef void (VKAPI_PTR *PFN_vkCmdEndTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *); typedef void (VKAPI_PTR *PFN_vkCmdExecuteCommands)(VkCommandBuffer, uint32_t, const VkCommandBuffer *); typedef void (VKAPI_PTR *PFN_vkCmdFillBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t); typedef void (VKAPI_PTR *PFN_vkCmdNextSubpass)(VkCommandBuffer, VkSubpassContents); @@ -4936,12 +5005,15 @@ VkResult VKAPI_CALL vkBindImageMemory2(VkDevice device, uint32_t bindInfoCount, VkResult VKAPI_CALL vkBindImageMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos); void VKAPI_CALL vkCmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer, const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin); void VKAPI_CALL vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags); +void VKAPI_CALL vkCmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index); void VKAPI_CALL vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkSubpassContents contents); void VKAPI_CALL vkCmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfoKHR *pSubpassBeginInfo); +void VKAPI_CALL vkCmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets); void VKAPI_CALL vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t *pDynamicOffsets); void VKAPI_CALL vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType); void VKAPI_CALL vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); void VKAPI_CALL vkCmdBindShadingRateImageNV(VkCommandBuffer commandBuffer, VkImageView imageView, VkImageLayout imageLayout); +void VKAPI_CALL vkCmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes); void VKAPI_CALL vkCmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets); void VKAPI_CALL vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageBlit *pRegions, VkFilter filter); void VKAPI_CALL vkCmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, uint32_t rectCount, const VkClearRect *pRects); @@ -4962,6 +5034,7 @@ void VKAPI_CALL vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer void VKAPI_CALL vkCmdDrawIndexedIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawIndexedIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride); +void VKAPI_CALL vkCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, uint32_t vertexStride); void VKAPI_CALL vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); void VKAPI_CALL vkCmdDrawMeshTasksIndirectCountNV(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); @@ -4969,8 +5042,10 @@ void VKAPI_CALL vkCmdDrawMeshTasksIndirectNV(VkCommandBuffer commandBuffer, VkBu void VKAPI_CALL vkCmdDrawMeshTasksNV(VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask); void VKAPI_CALL vkCmdEndConditionalRenderingEXT(VkCommandBuffer commandBuffer); void VKAPI_CALL vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query); +void VKAPI_CALL vkCmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index); void VKAPI_CALL vkCmdEndRenderPass(VkCommandBuffer commandBuffer); void VKAPI_CALL vkCmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, const VkSubpassEndInfoKHR *pSubpassEndInfo); +void VKAPI_CALL vkCmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets); void VKAPI_CALL vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); void VKAPI_CALL vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data); void VKAPI_CALL vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents); -- 2.18.1

1 0

[PATCH 1/4] comctl32/listview: Skip earlier when creating iterator for empty lists.
by Nikolay Sivov 15 Oct '18

15 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 95d619af75..6b32167dcd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1351,11 +1351,14 @@ static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *frame) { RECT rcItem, rcTemp; - + + TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); + /* in case we fail, we want to return an empty iterator */ if (!iterator_empty(i)) return FALSE; - TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); + if (infoPtr->nItemCount == 0) + return TRUE; if (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON) { -- 2.19.1

1 3

[PATCH] gdi32: Support the subpixel rendering gamma correction.
by Byeongsik Jeon 15 Oct '18

15 Oct '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- By setting the appropriate gamma value, subpixel color fringing reduced. https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#F… dlls/gdi32/dc.c | 1 + dlls/gdi32/dibdrv/dibdrv.h | 9 ++++++- dlls/gdi32/dibdrv/graphics.c | 38 ++++++++++++++++++++++---- dlls/gdi32/dibdrv/primitives.c | 49 +++++++++++++++++++++++++--------- dlls/gdi32/font.c | 28 +++++++++++++++++++ dlls/gdi32/gdi_private.h | 1 + 6 files changed, 108 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 892d3e9744..dd7a86d571 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -87,6 +87,7 @@ static void set_initial_dc_state( DC *dc ) dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ dc->layout = 0; dc->font_code_page = CP_ACP; + dc->font_gamma = 0; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f79f5b0867..ea33386faf 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -85,6 +85,13 @@ struct intensity_range BYTE b_min, b_max; }; +struct font_gamma_lut +{ + DWORD value; + BYTE encode[256]; + BYTE decode[256]; +}; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -192,7 +199,7 @@ typedef struct primitive_funcs void (* draw_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, const POINT *origin, DWORD text_pixel, const struct intensity_range *ranges); void (* draw_subpixel_glyph)(const dib_info *dst, const RECT *rc, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ); + const POINT *origin, DWORD text_pixel, const struct font_gamma_lut *gamma); DWORD (* get_pixel)(const dib_info *dib, int x, int y); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08f8c3d6d2..195866b92f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -683,7 +683,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics, const dib_info *glyph_dib, DWORD text_color, - const struct intensity_range *ranges, const struct clipped_rects *clipped_rects, + const void *lut, const struct clipped_rects *clipped_rects, RECT *bounds ) { int i; @@ -705,10 +705,10 @@ static void draw_glyph( dib_info *dib, int x, int y, const GLYPHMETRICS *metrics if (glyph_dib->bit_count == 32) dib->funcs->draw_subpixel_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color ); + text_color, lut ); else dib->funcs->draw_glyph( dib, &clipped_rect, glyph_dib, &src_origin, - text_color, ranges ); + text_color, lut ); } } } @@ -808,6 +808,19 @@ done: return add_cached_glyph( font, index, flags, glyph ); } +static inline void update_font_gamma_lut( DWORD value, struct font_gamma_lut *gamma ) +{ + int i; + + for ( i = 0; i < 256; i++ ) + { + gamma->encode[i] = pow( i / 255., 1000. / value ) * 255. + .5; + gamma->decode[i] = pow( i / 255., value / 1000. ) * 255. + .5; + } + + gamma->value = value; +} + static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT x, INT y, UINT flags, const WCHAR *str, UINT count, const INT *dx, const struct clipped_rects *clipped_rects, RECT *bounds ) @@ -817,6 +830,8 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT dib_info glyph_dib; DWORD text_color; struct intensity_range ranges[17]; + static struct font_gamma_lut gamma; + void *lut = NULL; glyph_dib.bit_count = get_glyph_depth( font->aa_flags ); glyph_dib.rect.left = 0; @@ -826,8 +841,21 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); - if (glyph_dib.bit_count == 8) + switch ( glyph_dib.bit_count ) + { + case 8: get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); + lut = ranges; + break; + case 32: + if ( gamma.value != dc->font_gamma ) + { + update_font_gamma_lut( dc->font_gamma, &gamma ); + TRACE( "font_contrast = %d\n", gamma.value ); + } + lut = γ + break; + } for (i = 0; i < count; i++) { @@ -841,7 +869,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.stride = get_dib_stride( glyph->metrics.gmBlackBoxX, glyph_dib.bit_count ); glyph_dib.bits.ptr = glyph->bits; - draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, ranges, clipped_rects, bounds ); + draw_glyph( dib, x, y, &glyph->metrics, &glyph_dib, text_color, lut, clipped_rects, bounds ); if (dx) { diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 0d097b2da6..2be3fcf3f1 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6272,16 +6272,35 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in { return; } +static inline BYTE blend_color_gamma( BYTE dst, BYTE text, BYTE alpha, + const struct font_gamma_lut *gamma ) +{ + if ( alpha == 0 ) return dst; + if ( alpha == 255 ) return text; + if ( dst == text ) return dst; + + return gamma->encode[ blend_color( gamma->decode[dst], + gamma->decode[text], + alpha) ]; +} -static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha, + const struct font_gamma_lut *gamma ) { + if ( gamma != NULL && gamma->value != 1000 ) + { + return blend_color_gamma( r, text >> 16, (BYTE)(alpha >> 16), gamma ) << 16 | + blend_color_gamma( g, text >> 8, (BYTE)(alpha >> 8), gamma ) << 8 | + blend_color_gamma( b, text, (BYTE) alpha, gamma ); + } return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 | blend_color( b, text, (BYTE) alpha ); } static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_lut *gamma ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6292,7 +6311,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con for (x = 0; x < rect->right - rect->left; x++) { if (glyph_ptr[x] == 0) continue; - dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, glyph_ptr[x] ); + dst_ptr[x] = blend_subpixel( dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], + text_pixel, glyph_ptr[x], gamma ); } dst_ptr += dib->stride / 4; glyph_ptr += glyph->stride / 4; @@ -6300,7 +6320,8 @@ static void draw_subpixel_glyph_8888( const dib_info *dib, const RECT *rect, con } static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_lut *gamma ) { DWORD *dst_ptr = get_pixel_ptr_32( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6319,7 +6340,7 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], gamma ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 4; @@ -6328,7 +6349,8 @@ static void draw_subpixel_glyph_32( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_lut *gamma ) { BYTE *dst_ptr = get_pixel_ptr_24( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6341,7 +6363,7 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const { if (glyph_ptr[x] == 0) continue; val = blend_subpixel( dst_ptr[x * 3 + 2], dst_ptr[x * 3 + 1], dst_ptr[x * 3], - text_pixel, glyph_ptr[x] ); + text_pixel, glyph_ptr[x], gamma ); dst_ptr[x * 3] = val; dst_ptr[x * 3 + 1] = val >> 8; dst_ptr[x * 3 + 2] = val >> 16; @@ -6352,7 +6374,8 @@ static void draw_subpixel_glyph_24( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_lut *gamma ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6371,7 +6394,7 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons val = blend_subpixel( ((dst_ptr[x] >> 7) & 0xf8) | ((dst_ptr[x] >> 12) & 0x07), ((dst_ptr[x] >> 2) & 0xf8) | ((dst_ptr[x] >> 7) & 0x07), ((dst_ptr[x] << 3) & 0xf8) | ((dst_ptr[x] >> 2) & 0x07), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); } dst_ptr += dib->stride / 2; @@ -6380,7 +6403,8 @@ static void draw_subpixel_glyph_555( const dib_info *dib, const RECT *rect, cons } static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_lut *gamma ) { WORD *dst_ptr = get_pixel_ptr_16( dib, rect->left, rect->top ); const DWORD *glyph_ptr = get_pixel_ptr_32( glyph, origin->x, origin->y ); @@ -6399,7 +6423,7 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const val = blend_subpixel( get_field(dst_ptr[x], dib->red_shift, dib->red_len), get_field(dst_ptr[x], dib->green_shift, dib->green_len), get_field(dst_ptr[x], dib->blue_shift, dib->blue_len), - text, glyph_ptr[x] ); + text, glyph_ptr[x], NULL ); dst_ptr[x] = rgb_to_pixel_masks( dib, val >> 16, val >> 8, val ); } dst_ptr += dib->stride / 2; @@ -6408,7 +6432,8 @@ static void draw_subpixel_glyph_16( const dib_info *dib, const RECT *rect, const } static void draw_subpixel_glyph_null( const dib_info *dib, const RECT *rect, const dib_info *glyph, - const POINT *origin, DWORD text_pixel ) + const POINT *origin, DWORD text_pixel, + const struct font_gamma_lut *gamma ) { return; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5c67d5b518..90dcf178de 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -729,6 +729,33 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } +static void update_font_gamma( DC *dc ) +{ + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; + static const WCHAR smoothing_gamma[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', + 'G','a','m','m','a',0}; + static BOOL need_update = TRUE; + const DWORD gamma_default = 1000; /* FIXME 1400 */ + static DWORD gamma = gamma_default; + HKEY key; + + if ( need_update && + RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS ) + { + if ( get_key_value( key, smoothing_gamma, &gamma ) || gamma == 0 ) + gamma = gamma_default; + RegCloseKey( key ); + + gamma = min( max( gamma, 1000), 2200 ); + need_update = FALSE; + } + + dc->font_gamma = gamma; + + TRACE("font_gamma %d\n", dc->font_gamma); +} + /*********************************************************************** * FONT_SelectObject */ @@ -754,6 +781,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) dc->hFont = handle; dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc, handle ); + update_font_gamma( dc ); GDI_dec_ref_count( ret ); } else GDI_dec_ref_count( handle ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5b09b84846..da8e6f32ef 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -100,6 +100,7 @@ typedef struct tagDC struct gdi_path *path; UINT font_code_page; + DWORD font_gamma; WORD ROPmode; WORD polyFillMode; WORD stretchBltMode; -- 2.19.1

2 1

[PATCH 10/10] ole32: Add free threaded marshaler GetUnmarshalClass tests.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 50 ++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 21 deletions(-)

2 1

[PATCH 09/10] ole32: Add DfMarshal custom marshaling tests.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 59 +++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-)

2 1

[PATCH 08/10] ole32: Add StdMarshal custom marshaling test.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 158 ++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-)

2 1

[PATCH 07/10] ole32: Add standard marshaling data tests.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)

2 1

[PATCH 06/10] ole32: Add initial CoGetStandardMarshal tests.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

2 1

[PATCH 05/10] ole32/tests: Import uuid.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/Makefile.in | 2 +- dlls/ole32/tests/compobj.c | 4 +--- dlls/ole32/tests/marshal.c | 4 ---- dlls/ole32/tests/moniker.c | 1 - dlls/ole32/tests/ole2.c | 6 ------ dlls/ole32/tests/ole_server.c | 3 --- dlls/ole32/tests/stg_prop.c | 6 ------ 7 files changed, 2 insertions(+), 24 deletions(-)

2 1

[PATCH 04/10] ole32: Change returned size in CoGetMarshalSizeMax if object implements IMarshal.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/marshal.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH 03/10] ole32: Make standard marshaler responsible for marshaling OBJREF header.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/marshal.c | 224 ++++++++++++++++++++++++++++++------------- 1 file changed, 158 insertions(+), 66 deletions(-)

2 1

[PATCH 02/10] ole32: Use CLSID_StdMarshal in standard marshaler.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/marshal.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-)

2 1

[PATCH 01/10] ole32: Don't pass incorrect iface pointer to StdMarshalImpl functions.
by Piotr Caban 15 Oct '18

15 Oct '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/marshal.c | 88 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 77 insertions(+), 11 deletions(-)

2 1

[PATCH 1/5] oleaut32: Handle VT_(U)I8 in get_type_size().
by Zebediah Figura 15 Oct '18

15 Oct '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/usrmarshal.c | 30 ++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 3 +++ 2 files changed, 33 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 5ea13e4..0185b6d 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -964,6 +964,36 @@ static void test_marshal_VARIANT(void) VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + /*** I8 ***/ + VariantInit(&v); + V_VT(&v) = VT_I8; + V_I8(&v) = (LONGLONG)1000000 * 1000000; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + ok(stubMsg.BufferLength == 32, "size %d\n", stubMsg.BufferLength); + + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + memset(buffer, 0xcc, stubMsg.BufferLength); + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + wirev = (DWORD*)buffer; + + wirev = check_variant_header(wirev, &v, stubMsg.BufferLength); + ok(*wirev == 0xcccccccc, "wv[5] %08x\n", *wirev); /* pad */ + wirev++; + ok(*(LONGLONG *)wirev == V_I8(&v), "wv[6] %s\n", wine_dbgstr_longlong(*(LONGLONG *)wirev)); + VariantInit(&v2); + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + ok(V_I8(&v) == V_I8(&v2), "got i8 %s expect %s\n", + wine_dbgstr_longlong(V_I8(&v)), wine_dbgstr_longlong(V_I8(&v2))); + + VARIANT_UserFree(&umcb.Flags, &v2); + HeapFree(GetProcessHeap(), 0, oldbuffer); + /*** R4 ***/ VariantInit(&v); V_VT(&v) = VT_R4; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index da524c8..d3dc93a 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -227,6 +227,9 @@ unsigned int get_type_size(ULONG *pFlags, VARTYPE vt) case VT_INT: case VT_UINT: return sizeof(INT); + case VT_I8: + case VT_UI8: + return sizeof(LONGLONG); case VT_R4: return sizeof(FLOAT); case VT_R8: -- 2.7.4

2 7

[PATCH 5/5] hnetcfg/tests: Add IUPnPNAT interface tests
by Alistair Leslie-Hughes 15 Oct '18

15 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/tests/policy.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 208f583..61175f9 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -27,6 +27,7 @@ #include "wine/test.h" #include "netfw.h" +#include "natupnp.h" static void test_policy2_rules(INetFwPolicy2 *policy2) { @@ -160,6 +161,35 @@ static void test_NetFwAuthorizedApplication(void) INetFwAuthorizedApplication_Release(app); } +static void test_IUPnPNAT(void) +{ + IUPnPNAT *nat; + IStaticPortMappingCollection *static_ports; + IDynamicPortMappingCollection *dync_ports; + INATEventManager *manager; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUPnPNAT, (void**)&nat); + ok(hr == S_OK, "got: %08x\n", hr); + + hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); + todo_wine ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK && static_ports) + IStaticPortMappingCollection_Release(static_ports); + + hr = IUPnPNAT_get_DynamicPortMappingCollection(nat, &dync_ports); + ok(hr == S_OK || hr == E_NOTIMPL /* Windows 8.1 */, "got: %08x\n", hr); + if(hr == S_OK && dync_ports) + IDynamicPortMappingCollection_Release(dync_ports); + + hr = IUPnPNAT_get_NATEventManager(nat, &manager); + todo_wine ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK && manager) + INATEventManager_Release(manager); + + IUPnPNAT_Release(nat); +} + START_TEST(policy) { INetFwMgr *manager; @@ -180,6 +210,7 @@ START_TEST(policy) test_interfaces(); test_NetFwAuthorizedApplication(); + test_IUPnPNAT(); CoUninitialize(); } -- 1.9.1

2 1

[PATCH 4/5] hnetcfg: Linked to uuid
by Alistair Leslie-Hughes 14 Oct '18

14 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/manager.c | 2 -- dlls/uuid/uuid.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 44c9cb5..e4960ab 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,5 +1,5 @@ MODULE = hnetcfg.dll -IMPORTS = oleaut32 ole32 advapi32 mpr +IMPORTS = oleaut32 ole32 advapi32 mpr uuid C_SRCS = \ apps.c \ diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index d3f089e..2d89479 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -25,10 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "initguid.h" #include "ole2.h" #include "netfw.h" -#include "natupnp.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 913e99c..aa3b30c 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -79,6 +79,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "perhist.h" #include "netcon.h" #include "netfw.h" +#include "natupnp.h" #include "msctf.h" #include "sensevts.h" #include "ocmm.h" -- 1.9.1

1 0

[PATCH 3/5] hnetcfg: Support IUPnPNAT interface
by Alistair Leslie-Hughes 14 Oct '18

14 Oct '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=34711 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/apps.c | 4 +- dlls/hnetcfg/hnetcfg.c | 7 ++ dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/manager.c | 1 + dlls/hnetcfg/port.c | 167 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index e671e8c..9972468 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "wine/heap.h" @@ -115,7 +116,8 @@ static REFIID tid_id[] = &IID_INetFwOpenPorts, &IID_INetFwPolicy, &IID_INetFwPolicy2, - &IID_INetFwProfile + &IID_INetFwProfile, + &IID_IUPnPNAT }; HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index e56dbab..5cc24a1 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -25,6 +25,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "hnetcfg_private.h" @@ -114,6 +115,8 @@ static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; static hnetcfg_cf fw_policy2_cf = { { &hnetcfg_cf_vtbl }, NetFwPolicy2_create }; +static hnetcfg_cf upnpnat_cf = { { &hnetcfg_cf_vtbl }, IUPnPNAT_create }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { @@ -156,6 +159,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &fw_policy2_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UPnPNAT )) + { + cf = &upnpnat_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 5245883..be2d0f3 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -27,6 +27,7 @@ enum type_id INetFwPolicy2_tid, INetFwProfile_tid, INetFwRules_tid, + IUPnPNAT_tid, last_tid }; @@ -42,3 +43,4 @@ HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT IUPnPNAT_create(IUnknown *, void **) DECLSPEC_HIDDEN; diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 1d548b4..d3f089e 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 7d74965..f497bcb 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -27,7 +27,9 @@ #include "winuser.h" #include "ole2.h" #include "netfw.h" +#include "natupnp.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" #include "hnetcfg_private.h" @@ -603,3 +605,168 @@ HRESULT NetFwOpenPorts_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("returning iface %p\n", *ppObj); return S_OK; } + +typedef struct _upnpnat +{ + IUPnPNAT IUPnPNAT_iface; + LONG ref; +} upnpnat; + +static inline upnpnat *impl_from_IUPnPNAT( IUPnPNAT *iface ) +{ + return CONTAINING_RECORD(iface, upnpnat, IUPnPNAT_iface); +} + +static HRESULT WINAPI upnpnat_QueryInterface(IUPnPNAT *iface, REFIID riid, void **object) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), object ); + + if ( IsEqualGUID( riid, &IID_IUPnPNAT ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *object = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IUPnPNAT_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI upnpnat_AddRef(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI upnpnat_Release(IUPnPNAT *iface) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + LONG refs = InterlockedDecrement( &This->ref ); + if (!refs) + { + heap_free( This ); + } + return refs; +} + +static HRESULT WINAPI upnpnat_GetTypeInfoCount(IUPnPNAT *iface, UINT *pctinfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI upnpnat_GetTypeInfo(IUPnPNAT *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( IUPnPNAT_tid, ppTInfo ); +} + +static HRESULT WINAPI upnpnat_GetIDsOfNames(IUPnPNAT *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_Invoke(IUPnPNAT *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo( IUPnPNAT_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->IUPnPNAT_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, IStaticPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, collection); + if(collection) + *collection = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI upnpnat_get_NATEventManager(IUPnPNAT *iface, INATEventManager **manager) +{ + upnpnat *This = impl_from_IUPnPNAT( iface ); + FIXME("%p, %p\n", This, manager); + if(manager) + *manager = NULL; + return E_NOTIMPL; +} + +const static IUPnPNATVtbl upnpnat_vtbl = +{ + upnpnat_QueryInterface, + upnpnat_AddRef, + upnpnat_Release, + upnpnat_GetTypeInfoCount, + upnpnat_GetTypeInfo, + upnpnat_GetIDsOfNames, + upnpnat_Invoke, + upnpnat_get_StaticPortMappingCollection, + upnpnat_get_DynamicPortMappingCollection, + upnpnat_get_NATEventManager +}; + + +HRESULT IUPnPNAT_create(IUnknown *outer, void **object) +{ + upnpnat *nat; + + TRACE("(%p,%p)\n", outer, object); + + nat = heap_alloc( sizeof(*nat) ); + if (!nat) return E_OUTOFMEMORY; + + nat->IUPnPNAT_iface.lpVtbl = &upnpnat_vtbl; + nat->ref = 1; + + *object = &nat->IUPnPNAT_iface; + + TRACE("returning iface %p\n", *object); + return S_OK; +} -- 1.9.1

1 0

[PATCH 2/5] hnetcfg: Register NATUPnP interface
by Alistair Leslie-Hughes 14 Oct '18

14 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/hnetcfg_tlb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hnetcfg/hnetcfg_tlb.idl b/dlls/hnetcfg/hnetcfg_tlb.idl index 33e8cc8..e368fe6 100644 --- a/dlls/hnetcfg/hnetcfg_tlb.idl +++ b/dlls/hnetcfg/hnetcfg_tlb.idl @@ -21,3 +21,4 @@ #pragma makedep regtypelib #include "netfw.idl" +#include "natupnp.idl" -- 1.9.1

1 0

[PATCH 1/5] include: Add natupnp.idl
by Alistair Leslie-Hughes 14 Oct '18

14 Oct '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/natupnp.idl | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+) create mode 100644 include/natupnp.idl diff --git a/include/Makefile.in b/include/Makefile.in index c182a52..08c57fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -455,6 +455,7 @@ SOURCES = \ msxmldid.h \ mtxdm.h \ multimon.h \ + natupnp.idl \ nb30.h \ ncrypt.h \ ndrtypes.h \ diff --git a/include/natupnp.idl b/include/natupnp.idl new file mode 100644 index 0000000..9dbccf2 --- /dev/null +++ b/include/natupnp.idl @@ -0,0 +1,223 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "oaidl.idl"; +import "ocidl.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + object, + uuid(6F10711F-729B-41E5-93B8-F21D0F818DF1), + dual, + pointer_default(unique) +] +interface IStaticPortMapping : IDispatch +{ + [propget, id(1)] + HRESULT ExternalIPAddress ([out, retval] BSTR *value); + + [propget, id(2)] + HRESULT ExternalPort([out, retval] long *value); + + [propget, id(3)] + HRESULT InternalPort([out, retval] long *value); + + [propget, id(4)] + HRESULT Protocol([out, retval] BSTR *value); + + [propget, id(5)] + HRESULT InternalClient([out, retval] BSTR *value); + + [propget, id(6)] + HRESULT Enabled([out, retval] VARIANT_BOOL *value); + + [propget, id(7)] + HRESULT Description([out, retval] BSTR *value); + + [id(8)] + HRESULT EditInternalClient ([in] BSTR client); + + [id(9)] + HRESULT Enable ([in] VARIANT_BOOL enable); + + [id(10)] + HRESULT EditDescription ([in] BSTR description); + + [id(11)] + HRESULT EditInternalPort ([in] long port); +}; + +[ + object, + uuid(cd1f3e77-66d6-4664-82c7-36dbb641d0f1), + dual, + pointer_default(unique) +] +interface IStaticPortMappingCollection : IDispatch +{ + [propget, id(DISPID_NEWENUM), hidden, restricted] + HRESULT _NewEnum([out, retval] IUnknown **value); + + [propget, id(DISPID_VALUE)] + HRESULT Item([in] long port, [in] BSTR protocol, [out, retval] IStaticPortMapping **mapping); + + [propget, id(1)] + HRESULT Count([out, retval] long *value); + + [id(2)] + HRESULT Remove([in] long port, [in] BSTR protocol); + + [id(3)] + HRESULT Add([in] long external, [in] BSTR protocol, [in] long internal, [in] BSTR client, + [in] VARIANT_BOOL enabled, [in] BSTR description, [out, retval] IStaticPortMapping **mapping); +}; + +[ + object, + uuid(4FC80282-23B6-4378-9A27-CD8F17C9400C), + dual, + pointer_default(unique) +] +interface IDynamicPortMapping : IDispatch +{ + [propget, id(1)] + HRESULT ExternalIPAddress ([out, retval] BSTR *value); + + [propget, id(2)] + HRESULT RemoteHost ([out, retval] BSTR *value); + + [propget, id(3)] + HRESULT ExternalPort([out, retval] long *value); + + [propget, id(4)] + HRESULT Protocol([out, retval] BSTR *value); + + [propget, id(5)] + HRESULT InternalPort([out, retval] long *value); + + [propget, id(6)] + HRESULT InternalClient([out, retval] BSTR *value); + + [propget, id(7)] + HRESULT Enabled([out, retval] VARIANT_BOOL *value); + + [propget, id(8)] + HRESULT Description([out, retval] BSTR *value); + + [propget, id(9)] + HRESULT LeaseDuration([out, retval] long *value); + + [id(10)] + HRESULT RenewLease([in] long desired, [out, retval] long *duration); + + [id(11)] + HRESULT EditInternalClient ([in] BSTR client); + + [id(12)] + HRESULT Enable ([in] VARIANT_BOOL enabled); + + [id(13)] + HRESULT EditDescription ([in] BSTR description); + + [id(14)] + HRESULT EditInternalPort ([in] long port); +}; + +[ + object, + uuid(b60de00f-156e-4e8d-9ec1-3a2342c10899), + dual, + pointer_default(unique) +] +interface IDynamicPortMappingCollection : IDispatch +{ + [propget, id(DISPID_NEWENUM), hidden, restricted] + HRESULT _NewEnum([out, retval] IUnknown **value); + + [propget, id(DISPID_VALUE)] + HRESULT Item([in] BSTR host, [in] long port, [in] BSTR orotocol, + [out, retval] IDynamicPortMapping **mapping); + + [propget, id(1)] + HRESULT Count([out, retval] long *value); + + [id(2)] + HRESULT Remove([in] BSTR host, [in] long port, [in] BSTR protocol); + + [id(3)] + HRESULT Add([in] BSTR host, [in] long port, [in] BSTR protocol, [in] long internal, + [in] BSTR client, [in] VARIANT_BOOL enabled, [in] BSTR Description, + [in] long duration, [out, retval] IDynamicPortMapping **mapping); +}; + +[ + object, + uuid(624bd588-9060-4109-b0b0-1adbbcac32df), + dual, + pointer_default(unique) +] +interface INATEventManager : IDispatch +{ + [id(1), propput] + HRESULT ExternalIPAddressCallback ([in] IUnknown *unk); + + [id(2), propput] + HRESULT NumberOfEntriesCallback ([in] IUnknown *unk); +}; + +[ + object, + uuid(b171c812-cc76-485a-94d8-b6b3a2794e99), + dual, + pointer_default(unique) +] +interface IUPnPNAT : IDispatch +{ + [propget, id(1)] + HRESULT StaticPortMappingCollection ([out, retval] IStaticPortMappingCollection **collection); + + [propget, id(2)] + HRESULT DynamicPortMappingCollection ([out, retval] IDynamicPortMappingCollection **collection); + + [propget, id(3)] + HRESULT NATEventManager ([out, retval] INATEventManager **manager); +}; + +[ + uuid(1c565858-f302-471e-b409-f180aa4abec6), + version(1.0) +] +library NATUPNPLib +{ + importlib("stdole2.tlb"); + + [ + vi_progid("HNetCfg.NATUPnP"), + progid("HNetCfg.NATUPnP.1"), + threading(both), + uuid(ae1e00aa-3fd5-403c-8a27-2bbdc30cd0e1) + ] + coclass UPnPNAT + { + [default] interface IUPnPNAT; + }; +}; -- 1.9.1

1 0

[PATCH] dinput: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Oct '18

14 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/config.c | 4 ++-- dlls/dinput/device.c | 15 +++++++-------- dlls/dinput/dinput_main.c | 10 +++++----- dlls/dinput/joystick.c | 8 ++++---- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/keyboard.c | 2 +- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 708f406375..bb36db02d5 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -95,7 +95,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); width = (viewRect.right - viewRect.left)/2; - LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, sizeof(column)/sizeof(column[0])); + LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -103,7 +103,7 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); - LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, sizeof(column)/sizeof(column[0])); + LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); listColumn.cx = width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f99dc20cd1..322c8ac9c4 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -80,7 +80,7 @@ static void _dump_cooperativelevel_DI(DWORD dwFlags) { #undef FE }; TRACE(" cooperative level : "); - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if (flags[i].mask & dwFlags) TRACE("%s ",flags[i].name); TRACE("\n"); @@ -106,7 +106,7 @@ static void _dump_ObjectDataFormat_flags(DWORD dwFlags) { TRACE("Flags:"); /* First the flags */ - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) { + for (i = 0; i < ARRAY_SIZE(flags); i++) { if (flags[i].mask & dwFlags) TRACE(" %s",flags[i].name); } @@ -153,7 +153,7 @@ static void _dump_EnumObjects_flags(DWORD dwFlags) { if (type == DIDFT_ALL) { TRACE(" DIDFT_ALL"); } else { - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) { + for (i = 0; i < ARRAY_SIZE(flags); i++) { if (flags[i].mask & type) { type &= ~flags[i].mask; TRACE(" %s",flags[i].name); @@ -230,7 +230,7 @@ const char *_dump_dinput_GUID(const GUID *guid) { }; if (guid == NULL) return "null GUID"; - for (i = 0; i < (sizeof(guids) / sizeof(guids[0])); i++) { + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (IsEqualGUID(guids[i].guid, guid)) { return guids[i].name; } @@ -916,7 +916,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L if (dwFlags & DIDSAM_NOUSER) dps.wsz[0] = '\0'; else - lstrcpynW(dps.wsz, username, sizeof(dps.wsz)/sizeof(WCHAR)); + lstrcpynW(dps.wsz, username, ARRAY_SIZE(dps.wsz)); IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); /* Save the settings to disk */ @@ -1323,7 +1323,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, { if (*device_player->username) { - lstrcpynW(ps->wsz, device_player->username, sizeof(ps->wsz)/sizeof(WCHAR)); + lstrcpynW(ps->wsz, device_player->username, ARRAY_SIZE(ps->wsz)); return DI_OK; } else break; @@ -1428,8 +1428,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( device_player->instance_guid = This->guid; } if (device_player) - lstrcpynW(device_player->username, ps->wsz, - sizeof(device_player->username)/sizeof(WCHAR)); + lstrcpynW(device_player->username, ps->wsz, ARRAY_SIZE(device_player->username)); break; } default: diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 32eedf18b2..28e192af4e 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -282,7 +282,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) TRACE("DIEDFL_ALLDEVICES\n"); return; } - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if (flags[i].mask & dwFlags) TRACE("%s ",flags[i].name); } @@ -1090,7 +1090,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( /* Add keyboard and mouse to remaining device count */ if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) { - for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) remain++; @@ -1119,7 +1119,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate keyboard and mouse */ - for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) { @@ -1191,7 +1191,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( /* Add keyboard and mouse to remaining device count */ if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) { - for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) remain++; @@ -1215,7 +1215,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ - for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) + for (i = 0; i < ARRAY_SIZE(guids); i++) { if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) { diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 45c361809e..9f426f3f2a 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -92,7 +92,7 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags) FE(DIEFF_SPHERICAL) #undef FE }; - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if (flags[i].mask & dwFlags) TRACE("%s ", flags[i].name); TRACE("\n"); @@ -786,7 +786,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, /* Only consider actions of the right genre */ if (lpdiaf->dwGenre != genre && genre != DIGENRE_ANY) continue; - for (j=0; j < sizeof(object_types)/sizeof(object_types[0]); j++) + for (j = 0; j < ARRAY_SIZE(object_types); j++) { if (type & object_types[j]) { @@ -979,7 +979,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ { int i; - for (i = 0; i < sizeof(axis_names) / sizeof(axis_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(axis_names); i++) { if (!strcmp(ptr, axis_names[i])) { @@ -1011,7 +1011,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ } } - if (i == sizeof(axis_names) / sizeof(axis_names[0])) + if (i == ARRAY_SIZE(axis_names)) { ERR("invalid joystick axis type: \"%s\"\n", ptr); i = -1; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 2b2aade813..0701b9f42c 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -279,7 +279,7 @@ static const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 6c7b535ea4..a64c59c603 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -508,7 +508,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) + pdidoi->tszName, ARRAY_SIZE(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi); -- 2.14.4

1 0

[PATCH 4/5] kernel32: MoveFile(source, source) should succeed.
by Dmitry Timoshkov 14 Oct '18

14 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 15 ++++++++++----- dlls/kernel32/tests/file.c | 2 +- dlls/msvcp120/tests/msvcp120.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 48a3e336ec..33b2358f1e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1281,7 +1281,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; - HANDLE source_handle = 0, dest_handle; + HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; DWORD options; @@ -1341,18 +1341,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - NtClose( dest_handle ); if (!(flag & MOVEFILE_REPLACE_EXISTING)) { - SetLastError( ERROR_ALREADY_EXISTS ); - RtlFreeUnicodeString( &nt_name ); - goto error; + if (!is_same_file( source_handle, dest_handle )) + { + SetLastError( ERROR_ALREADY_EXISTS ); + RtlFreeUnicodeString( &nt_name ); + goto error; + } } else if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) /* cannot replace directory */ { SetLastError( ERROR_ACCESS_DENIED ); goto error; } + + NtClose( dest_handle ); } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1412,6 +1416,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, error: if (source_handle) NtClose( source_handle ); + if (dest_handle) NtClose( dest_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); return FALSE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 433a2e5511..87e722b723 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1894,7 +1894,7 @@ static void test_MoveFileA(void) ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); ret = MoveFileA(source, source); - todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); ret = MoveFileA(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 2e63555f2e..ac38aa61a0 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1529,7 +1529,7 @@ static void test_tr2_sys__Rename(void) CloseHandle(file); ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1"); - todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); + ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 797a9cc8ae..bb27c6d390 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1313,8 +1313,8 @@ file move succeeded @todo_wine@bar@or_broken@baz read-only files are moveable file moved in subdirectory -@todo_wine@moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op! -@todo_wine@ErrorLevel: 0@or_broken@ErrorLevel: 1 +moving a file to itself is a no-op@or_broken@moving a file to itself should be a no-op! +ErrorLevel: 0@or_broken@ErrorLevel: 1 --- directory move simple directory move succeeded moving a directory to itself gives error; errlevel 1 -- 2.17.1

2 3

[PATCH 1/2] wined3d: Add sync object after query buffer issue.
by Andrew Wesie 14 Oct '18

14 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45932 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- Notes: Fixes regression on NVIDIA cards due to query buffer objects. Change tested on NVIDIA proprietary driver, Intel Mesa driver, and AMD Mesa driver. dlls/wined3d/query.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 26c32b1f13..d968b0a744 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -40,7 +40,7 @@ static BOOL wined3d_query_buffer_is_valid(struct wined3d_query *query) static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) { const struct wined3d_gl_info *gl_info = context->gl_info; - const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT; GLuint buffer_object; GL_EXTCALL(glGenBuffers(1, &buffer_object)); @@ -76,6 +76,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { const struct wined3d_gl_info *gl_info = context->gl_info; + GLsync tmp_sync; if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) return FALSE; @@ -101,9 +102,15 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)0)); GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)sizeof(query->map_ptr[0]))); + GL_EXTCALL(glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT)); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); + /* NVIDIA requires a sync object. */ + tmp_sync = GL_EXTCALL(glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)); + GL_EXTCALL(glDeleteSync(tmp_sync)); + checkGLcall("query buffer sync"); + return TRUE; } -- 2.17.1

3 5

[PATCH 5/5] kernel32: MoveFile should make sure that it has the delete access to the source file.
by Dmitry Timoshkov 14 Oct '18

14 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 7 ++++--- dlls/kernel32/tests/file.c | 20 ++++++++------------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 33b2358f1e..841a12b16b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1310,7 +1310,8 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &source_handle, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); + status = NtOpenFile( &source_handle, DELETE | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT ); if (status == STATUS_SUCCESS) status = wine_nt_to_unix_file_name( &nt_name, &source_unix, FILE_OPEN, FALSE ); RtlFreeUnicodeString( &nt_name ); @@ -1334,11 +1335,11 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; - status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options ); + status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { if (!(flag & MOVEFILE_REPLACE_EXISTING)) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 87e722b723..0c99fca0d1 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1914,12 +1914,10 @@ static void test_MoveFileA(void) ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError()); ret = MoveFileA(source, dest); - todo_wine { - ok(!ret, "MoveFileA: expected failure\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ - "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(!ret, "MoveFileA: expected failure\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ + "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); CloseHandle(hmapfile); CloseHandle(hfile); @@ -1934,12 +1932,10 @@ static void test_MoveFileA(void) ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError()); ret = MoveFileA(source, dest); - todo_wine { - ok(!ret, "MoveFileA: expected failure\n"); - ok(GetLastError() == ERROR_SHARING_VIOLATION || - broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ - "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); - } + ok(!ret, "MoveFileA: expected failure\n"); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */ + "MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); CloseHandle(hmapfile); CloseHandle(hfile); -- 2.17.1

1 0

[PATCH 3/5] kernel32/tests: Move the MoveFile test where it belongs.
by Dmitry Timoshkov 14 Oct '18

14 Oct '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index acf657f8c7..433a2e5511 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -706,9 +706,6 @@ static void test_CopyFileA(void) ret = GetTempFileNameA(temp_path, prefix, 0, source); ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); - ret = MoveFileA(source, source); - todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); - /* copying a file to itself must fail */ retok = CopyFileA(source, source, FALSE); ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), @@ -1896,6 +1893,9 @@ static void test_MoveFileA(void) ret = GetTempFileNameA(tempdir, prefix, 0, dest); ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + ret = MoveFileA(source, source); + todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + ret = MoveFileA(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, "MoveFileA: unexpected error %d\n", GetLastError()); -- 2.17.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel