October 2016 - Wine-Commits

Jeremy Audiger : wined3d: Add Nvidia GT 740M to the GPU list.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: ef8adb1feb77317c13cd45f6ded8fe71c7cad649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8adb1feb77317c13cd45f6d… Author: Jeremy Audiger <audiger(a)live.fr> Date: Fri Jul 29 12:38:42 2016 +0000 wined3d: Add Nvidia GT 740M to the GPU list. Signed-off-by: Jérémy Audiger <audiger(a)live.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a7681a877c9aa953b750593a3ff249c79d9a1f8f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e9e15e..51a26be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1274,6 +1274,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1777,6 +1778,7 @@ cards_nvidia_binary[] = {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ + {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ @@ -2137,6 +2139,7 @@ cards_nvidia_mesa[] = {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ + {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7d3796..58bf0f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1618,6 +1618,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, + CARD_NVIDIA_GEFORCE_GT740M = 0x1292, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380,

1 0

Nikolay Sivov : ucrtbase: Added __stdio_common_vsnwprintf_s().
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 598977af0ef15fc55a495a3dcef5413d29459dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=598977af0ef15fc55a495a3dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 22:21:49 2016 +0300 ucrtbase: Added __stdio_common_vsnwprintf_s(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 24291f2b6a96b0cffb738b5304e60fe9cf5efdd5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 70 ++++++++++++++-------- dlls/ucrtbase/tests/printf.c | 56 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 103 insertions(+), 27 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 223aa7c..11d3f1d 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -10,7 +10,7 @@ @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnprintf_s -@ stub __stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsprintf_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 56625e9..f8b5205 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -810,6 +810,37 @@ static int CDECL MSVCRT_vsnprintf_s_l_opt( char *str, MSVCRT_size_t sizeOfBuffer return ret; } +static int MSVCRT_vsnwprintf_s_l_opt( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, DWORD options, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + static const MSVCRT_wchar_t nullbyte = '\0'; + struct _str_ctx_w ctx; + int len, ret; + + len = sizeOfBuffer; + if(count!=-1 && len>count+1) + len = count+1; + + ctx.len = len; + ctx.buf = str; + ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, + arg_clbk_valist, NULL, &valist); + puts_clbk_str_w(&ctx, 1, &nullbyte); + + if(ret<0 || ret==len) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); + memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + /********************************************************************* * _vsnprintf_s_l (MSVCRT.@) */ @@ -865,6 +896,18 @@ int CDECL MSVCRT__stdio_common_vsnprintf_s( unsigned __int64 options, } /********************************************************************* + * __stdio_common_vsnwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, + MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist ) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); +} + +/********************************************************************* * __stdio_common_vsprintf_s (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, @@ -1064,6 +1107,7 @@ int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, return MSVCRT_vswprintf_p_l(buffer, length, format, NULL, args); } + /********************************************************************* * _vsnwprintf_s_l (MSVCRT.@) */ @@ -1071,31 +1115,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer MSVCRT_size_t count, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - static const MSVCRT_wchar_t nullbyte = '\0'; - struct _str_ctx_w ctx; - int len, ret; - - len = sizeOfBuffer; - if(count!=-1 && len>count+1) - len = count+1; - - ctx.len = len; - ctx.buf = str; - ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &valist); - puts_clbk_str_w(&ctx, 1, &nullbyte); - - if(ret<0 || ret==len) { - if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small", MSVCRT_ERANGE); - memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); - } else - str[len-1] = '\0'; - - return -1; - } - - return ret; + return MSVCRT_vsnwprintf_s_l_opt(str, sizeOfBuffer, count, format, 0, locale, valist); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index d3ed0a2..b3084ae 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -67,6 +67,8 @@ static int (__cdecl *p_vsprintf_s)(unsigned __int64 options, char *str, size_t c void *locale, __ms_va_list valist); static int (__cdecl *p_vswprintf)(unsigned __int64 options, wchar_t *str, size_t len, const wchar_t *format, void *locale, __ms_va_list valist); +static int (__cdecl *p_vsnwprintf_s)(unsigned __int64 options, WCHAR *str, size_t sizeOfBuffer, size_t count, const WCHAR *format, + void *locale, __ms_va_list valist); static FILE *(__cdecl *p_fopen)(const char *name, const char *mode); static int (__cdecl *p_fclose)(FILE *file); @@ -86,6 +88,7 @@ static BOOL init( void ) p_vfprintf = (void *)GetProcAddress(hmod, "__stdio_common_vfprintf"); p_vsprintf = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf"); p_vsnprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnprintf_s"); + p_vsnwprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsnwprintf_s"); p_vsprintf_s = (void *)GetProcAddress(hmod, "__stdio_common_vsprintf_s"); p_vswprintf = (void *)GetProcAddress(hmod, "__stdio_common_vswprintf"); @@ -360,6 +363,58 @@ static void test_vsnprintf_s(void) ok( !strcmp(out1, buffer), "buffer wrong, got=%s\n", buffer); } +static int __cdecl _vsnwprintf_s_wrapper(WCHAR *str, size_t sizeOfBuffer, + size_t count, const WCHAR *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vsnwprintf_s(0, str, sizeOfBuffer, count, format, NULL, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsnwprintf_s(void) +{ + const WCHAR format[] = {'A','B','%','u','C',0}; + const WCHAR out7[] = {'A','B','1','2','3','C',0}; + const WCHAR out6[] = {'A','B','1','2','3',0}; + const WCHAR out2[] = {'A',0}; + const WCHAR out1[] = {0}; + WCHAR buffer[14] = { 0 }; + int exp, got; + + /* Enough room. */ + exp = lstrlenW(out7); + + got = _vsnwprintf_s_wrapper(buffer, 14, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !lstrcmpW(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 12, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !lstrcmpW(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 7, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !lstrcmpW(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + /* Not enough room. */ + exp = -1; + + got = _vsnwprintf_s_wrapper(buffer, 6, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !lstrcmpW(out6, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 2, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !lstrcmpW(out2, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 1, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !lstrcmpW(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); +} + static void test_printf_legacy_wide(void) { const wchar_t wide[] = {'A','B','C','D',0}; @@ -457,6 +512,7 @@ START_TEST(printf) test_swprintf(); test_fprintf(); test_vsnprintf_s(); + test_vsnwprintf_s(); test_printf_legacy_wide(); test_printf_legacy_msvcrt(); test_printf_legacy_three_digit_exp(); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f60aa29..24eba52 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -155,7 +155,7 @@ @ stub __stdio_common_vfwprintf_s @ stub __stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnprintf_s -@ stub __stdio_common_vsnwprintf_s +@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long ptr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf @ stub __stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsprintf_s

1 0

Nikolay Sivov : gdi32: Support special 'ttcf' tag in GetFontData().
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 177c0d4e74a5d0482e8aeba2eaa2f5034fed58ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=177c0d4e74a5d0482e8aeba2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:50 2016 +0300 gdi32: Support special 'ttcf' tag in GetFontData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7e50116b52f37a3a191cb207c1543ffdd3941c8a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4eee506..b9d6768 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -209,8 +209,10 @@ MAKE_FUNCPTR(FcPatternGetString); #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ @@ -222,6 +224,7 @@ MAKE_FUNCPTR(FcPatternGetString); #define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') #define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') #define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') /* 'gasp' flags */ @@ -419,6 +422,7 @@ struct tagGdiFont { GdiFont *base_font; VOID *GSUB_Table; const VOID *vert_feature; + ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */ DWORD cache_num; DWORD instance_id; struct font_fileinfo *fileinfo; @@ -4516,6 +4520,9 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) font->ft_face = ft_face; if(FT_IS_SCALABLE(ft_face)) { + FT_ULong len; + DWORD header; + /* load the VDMX table if we have one */ font->ppem = load_VDMX(font, height); if(font->ppem == 0) @@ -4524,6 +4531,20 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); + + /* see if it's a TTC */ + len = sizeof(header); + if (!pFT_Load_Sfnt_Table(ft_face, 0, 0, (void*)&header, &len)) { + if (header == MS_TTCF_TAG) + { + len = sizeof(font->ttc_item_offset); + if (pFT_Load_Sfnt_Table(ft_face, 0, (3 + face->face_index) * sizeof(DWORD), + (void*)&font->ttc_item_offset, &len)) + font->ttc_item_offset = 0; + else + font->ttc_item_offset = GET_BE_DWORD(font->ttc_item_offset); + } + } } else { font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) @@ -4633,6 +4654,16 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf else len = cbData; + /* if font is a member of TTC, 'ttcf' tag allows reading from beginning of TTC file, + 0 tag means to read from start of collection member data. */ + if (font->ttc_item_offset) + { + if (table == MS_TTCF_TAG) + table = 0; + else if (table == 0) + offset += font->ttc_item_offset; + } + table = RtlUlongByteSwap( table ); /* MS tags differ in endianness from FT ones */ /* make sure value of len is the value freetype says it needs */

1 0

Nikolay Sivov : gdi32: Keep font tables tags defined in one place.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: dd7aa6626e3b99274d635b886c3ab6631f0786df URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7aa6626e3b99274d635b886… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:49 2016 +0300 gdi32: Keep font tables tags defined in one place. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd688217808ca347b68f6929b47b7cee03b5782c) Conflicts: dlls/gdi32/freetype.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 693a54d..4eee506 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -213,6 +213,21 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif +#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ + ( ( (FT_ULong)_x4 << 24 ) | \ + ( (FT_ULong)_x3 << 16 ) | \ + ( (FT_ULong)_x2 << 8 ) | \ + (FT_ULong)_x1 ) + +#define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') +#define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') +#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') + +/* 'gasp' flags */ +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 + /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -632,7 +647,6 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' /* These are all structures needed for the GSUB table */ -#define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') typedef struct { DWORD version; @@ -4646,13 +4660,7 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf * load the vdmx entry for the specified height */ -#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ - ( ( (FT_ULong)_x4 << 24 ) | \ - ( (FT_ULong)_x3 << 16 ) | \ - ( (FT_ULong)_x2 << 8 ) | \ - (FT_ULong)_x1 ) -#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { WORD version; @@ -5070,10 +5078,6 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 -#define GASP_TAG MS_MAKE_TAG('g','a','s','p') - static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) { DWORD size; @@ -5083,7 +5087,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) BOOL ret = FALSE; *flags = 0; - size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + size = get_font_data( font, MS_GASP_TAG, 0, NULL, 0 ); if (size == GDI_ERROR) return FALSE; if (size < 4 * sizeof(WORD)) return FALSE; if (size > sizeof(buf)) @@ -5092,7 +5096,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) if (!ptr) return FALSE; } - get_font_data( font, GASP_TAG, 0, ptr, size ); + get_font_data( font, MS_GASP_TAG, 0, ptr, size ); version = GET_BE_WORD( *ptr++ ); num_recs = GET_BE_WORD( *ptr++ ); @@ -5678,11 +5682,11 @@ found_face: if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { - int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); + int length = get_font_data(ret, MS_GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) { ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); - get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); + get_font_data(ret, MS_GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); ret->vert_feature = get_GSUB_vert_feature(ret); if (!ret->vert_feature) @@ -8401,7 +8405,6 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei /************************************************************************* * Kerning support for TrueType fonts */ -#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') struct TT_kern_table {

1 0

Alex Henrie : ole32: Implement StgOpenPropStg.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: b68941e307d6ec9db0e4ff0ccf8b8e31dd4bc432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68941e307d6ec9db0e4ff0cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:26 2016 -0600 ole32: Implement StgOpenPropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b045d726314aff340384798463db36044cbaa897) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b56e5d5..7851c75 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -269,6 +269,7 @@ @ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenAsyncDocfileOnIFillLockBytes +@ stdcall StgOpenPropStg(ptr ptr long long ptr) @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c3db945..04e0244 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2810,3 +2810,46 @@ end: TRACE("returning 0x%08x\n", r); return r; } + +HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, + DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %08x %d %p\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to open a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructFromStream(stm, fmt, + STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0

Nikolay Sivov : comctl32/treeview: Handle WM_SYSKEYDOWN.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 12f895bab86663313966956b2de910d76b158f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f895bab86663313966956b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 23:16:51 2016 +0300 comctl32/treeview: Handle WM_SYSKEYDOWN. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11beaf9978365ba58ac7c4d00680d95a5675ea39) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 695745c..b491bb6 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5743,6 +5743,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_HScroll(infoPtr, wParam); case WM_KEYDOWN: + case WM_SYSKEYDOWN: return TREEVIEW_KeyDown(infoPtr, wParam); case WM_KILLFOCUS: @@ -5807,8 +5808,6 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; - /* WM_SYSKEYDOWN */ - case WM_TIMER: return TREEVIEW_HandleTimer(infoPtr, wParam);

1 0

Nikolay Sivov : comctl32/treeview: Set hot item when hovering over item, not entire row.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 34a58c467ba2e59ce82e94b0d24da2a74b76b43f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a58c467ba2e59ce82e94b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 23:03:19 2016 +0300 comctl32/treeview: Set hot item when hovering over item, not entire row. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d73d6b209353dbb2f6e2e2880c18f6eaf4a137f5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b491bb6..453150f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3629,7 +3629,7 @@ TREEVIEW_HitTestPoint(const TREEVIEW_INFO *infoPtr, POINT pt) return item; } -static LRESULT +static TREEVIEW_ITEM * TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) { TREEVIEW_ITEM *item; @@ -3664,14 +3664,14 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) if (status) { lpht->flags = status; - return 0; + return NULL; } item = TREEVIEW_HitTestPoint(infoPtr, lpht->pt); if (!item) { lpht->flags = TVHT_NOWHERE; - return 0; + return NULL; } if (x >= item->textOffset + item->textWidth) @@ -3702,7 +3702,7 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) lpht->hItem = item; TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); - return (LRESULT)item; + return item; } /* Item Label Editing ***************************************************/ @@ -4125,7 +4125,7 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam) hit.pt.x = (short)LOWORD(lParam); hit.pt.y = (short)HIWORD(lParam); - item = (TREEVIEW_ITEM *)TREEVIEW_HitTest(infoPtr, &hit); + item = TREEVIEW_HitTest(infoPtr, &hit); if (!item) return 0; TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, item)); @@ -5325,9 +5325,9 @@ TREEVIEW_MouseLeave (TREEVIEW_INFO * infoPtr) static LRESULT TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) { - POINT pt; TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5352,18 +5352,21 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) _TrackMouseEvent(&trackinfo); } - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - - item = TREEVIEW_HitTestPoint(infoPtr, pt); + ht.pt.x = (short)LOWORD(lParam); + ht.pt.y = (short)HIWORD(lParam); - if (item != infoPtr->hotItem) + item = TREEVIEW_HitTest(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); - infoPtr->hotItem = item; - /* redraw new hot item */ - TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + infoPtr->hotItem = NULL; + if (item && (ht.flags & TVHT_ONITEM)) + { + infoPtr->hotItem = item; + /* redraw new hot item */ + TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); + } } return 0; @@ -5502,14 +5505,14 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - POINT pt; TREEVIEW_ITEM * item; + TVHITTESTINFO ht; NMMOUSE nmmouse; - GetCursorPos(&pt); - ScreenToClient(infoPtr->hwnd, &pt); + GetCursorPos(&ht.pt); + ScreenToClient(infoPtr->hwnd, &ht.pt); - item = TREEVIEW_HitTestPoint(infoPtr, pt); + item = TREEVIEW_HitTest(infoPtr, &ht); memset(&nmmouse, 0, sizeof(nmmouse)); if (item) @@ -5523,7 +5526,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) { SetCursor(infoPtr->hcurHand); return 0; @@ -5667,7 +5670,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_GetVisibleCount(infoPtr); case TVM_HITTEST: - return TREEVIEW_HitTest(infoPtr, (LPTVHITTESTINFO)lParam); + return (LRESULT)TREEVIEW_HitTest(infoPtr, (TVHITTESTINFO*)lParam); case TVM_INSERTITEMA: case TVM_INSERTITEMW:

1 0

Nikolay Sivov : ucrtbase: Added __stdio_common_vswprintf_s().
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: e48d3a14a02bfdcda758a98042c4c5355ce94652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48d3a14a02bfdcda758a9804… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 14:18:03 2016 +0300 ucrtbase: Added __stdio_common_vswprintf_s(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b6fd195279d874fff9ba1f81658d0ea49b5d36e7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 10 ++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 11d3f1d..8d55a3b 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -17,7 +17,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f8b5205..81910c8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -908,6 +908,16 @@ int CDECL MSVCRT__stdio_common_vsnwprintf_s( unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswprintf_s( unsigned __int64 options, + MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT__stdio_common_vsnwprintf_s(options, str, INT_MAX, count, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vsprintf_s (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 24eba52..965c921 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -162,7 +162,7 @@ @ cdecl __stdio_common_vsscanf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long ptr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p -@ stub __stdio_common_vswprintf_s +@ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist()

1 0

Nikolay Sivov : oleaut32: Fix return value when converting from NULL interface pointers.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: ff970fbbd1d102b652dbd38e46134444cb84c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff970fbbd1d102b652dbd38e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 12:03:48 2016 +0300 oleaut32: Fix return value when converting from NULL interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 806ea12766849660a4cfa20e189b6d96ba8f2891) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 20 ++++++++++++++++++++ dlls/oleaut32/variant.c | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7cbb059..8a42af1 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5854,6 +5854,16 @@ static void test_IUnknownChangeTypeEx(void) lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + /* NULL IUnknown -> IDispatch */ + V_VT(&vSrc) = VT_UNKNOWN; + V_UNKNOWN(&vSrc) = NULL; + VariantInit(&vDst); + V_DISPATCH(&vDst) = (void*)0xdeadbeef; + hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_DISPATCH); + ok(hres == S_OK && V_VT(&vDst) == VT_DISPATCH && V_DISPATCH(&vDst) == NULL, + "change unk(src,dst): expected 0x%08x,%d,%p, got 0x%08x,%d,%p\n", + S_OK, VT_DISPATCH, NULL, hres, V_VT(&vDst), V_DISPATCH(&vDst)); + V_VT(&vSrc) = VT_UNKNOWN; V_UNKNOWN(&vSrc) = pu; @@ -5998,6 +6008,16 @@ static void test_IDispatchChangeTypeEx(void) lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + /* NULL IDispatch -> IUnknown */ + V_VT(&vSrc) = VT_DISPATCH; + V_DISPATCH(&vSrc) = NULL; + VariantInit(&vDst); + V_UNKNOWN(&vDst) = (void*)0xdeadbeef; + hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN); + ok(hres == S_OK && V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == NULL, + "change unk(src,dst): expected 0x%08x,%d,%p, got 0x%08x,%d,%p\n", + S_OK, VT_UNKNOWN, NULL, hres, V_VT(&vDst), V_UNKNOWN(&vDst)); + V_VT(&vSrc) = VT_DISPATCH; V_DISPATCH(&vSrc) = pd; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b31e8bc..f60fef5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -460,7 +460,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, { case VT_DISPATCH: if (V_DISPATCH(ps) == NULL) + { V_UNKNOWN(pd) = NULL; + res = S_OK; + } else res = IDispatch_QueryInterface(V_DISPATCH(ps), &IID_IUnknown, (LPVOID*)&V_UNKNOWN(pd)); break; @@ -472,7 +475,10 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, { case VT_UNKNOWN: if (V_UNKNOWN(ps) == NULL) + { V_DISPATCH(pd) = NULL; + res = S_OK; + } else res = IUnknown_QueryInterface(V_UNKNOWN(ps), &IID_IDispatch, (LPVOID*)&V_DISPATCH(pd)); break;

1 0

Daniel Lehman : ucrtbase: Add some wide functions called on startup.
by Alexandre Julliard Oct. 7, 2016

Oct. 7, 2016

Module: wine Branch: stable Commit: 564aa88fc5e262f05ea804fc5cf9454a93c5061c URL: http://source.winehq.org/git/wine.git/?a=commit;h=564aa88fc5e262f05ea804fc5… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 31 14:27:27 2016 -0700 ucrtbase: Add some wide functions called on startup. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2ea84373cfd9854293bab8cb6e9bde284977d3bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/msvcrt/data.c | 18 ++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index b8ae54b..f7de559 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -24,7 +24,7 @@ @ cdecl _cexit() ucrtbase._cexit @ cdecl _clearfp() ucrtbase._clearfp @ cdecl _configure_narrow_argv(long) ucrtbase._configure_narrow_argv -@ stub _configure_wide_argv +@ cdecl _configure_wide_argv(long) ucrtbase._configure_wide_argv @ cdecl _control87(long long) ucrtbase._control87 @ cdecl _controlfp(long long) ucrtbase._controlfp @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s @@ -53,7 +53,7 @@ @ cdecl _getpid() ucrtbase._getpid @ cdecl _initialize_narrow_environment() ucrtbase._initialize_narrow_environment @ stub _initialize_onexit_table -@ stub _initialize_wide_environment +@ cdecl _initialize_wide_environment() ucrtbase._initialize_wide_environment @ cdecl _initterm(ptr ptr) ucrtbase._initterm @ cdecl _initterm_e(ptr ptr) ucrtbase._initterm_e @ cdecl _invalid_parameter_noinfo() ucrtbase._invalid_parameter_noinfo diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 7e75a7f..b665333 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -666,3 +666,21 @@ int CDECL _initialize_narrow_environment(void) TRACE("\n"); return 0; } + +/********************************************************************* + * _configure_wide_argv (UCRTBASE.@) + */ +int CDECL _configure_wide_argv(int mode) +{ + FIXME("(%d) stub\n", mode); + return 0; +} + +/********************************************************************* + * _initialize_wide_environment (UCRTBASE.@) + */ +int CDECL _initialize_wide_environment(void) +{ + FIXME("stub\n"); + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 965c921..26acae7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -230,7 +230,7 @@ @ cdecl _commit(long) MSVCRT__commit @ cdecl _configthreadlocale(long) @ cdecl _configure_narrow_argv(long) -@ stub _configure_wide_argv +@ cdecl _configure_wide_argv(long) @ cdecl _control87(long long) @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @@ -420,7 +420,7 @@ @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s @ cdecl _initialize_narrow_environment() @ stub _initialize_onexit_table -@ stub _initialize_wide_environment +@ cdecl _initialize_wide_environment() @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ cdecl _invalid_parameter_noinfo()

1 0