November 2022 - Wine-Commits

Nikolay Sivov : vbscript: Implement FormatCurrency().
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: d273247eb9bd3420ce06d7688a8accbd73c4dafb URL: https://gitlab.winehq.org/wine/wine/-/commit/d273247eb9bd3420ce06d7688a8acc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 16:27:58 2022 +0300 vbscript: Implement FormatCurrency(). --- dlls/vbscript/global.c | 32 +++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 424fbadda6c..471523c0c8f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2951,10 +2951,36 @@ static HRESULT Global_FormatNumber(BuiltinDisp *This, VARIANT *arg, unsigned arg return E_NOTIMPL; } -static HRESULT Global_FormatCurrency(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_FormatCurrency(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + union + { + struct + { + int num_dig, inc_lead, use_parens, group; + } s; + int val[4]; + } int_args = { .s.num_dig = -1, .s.inc_lead = -2, .s.use_parens = -2, .s.group = -2 }; + HRESULT hres; + BSTR str; + int i; + + TRACE("\n"); + + assert(1 <= args_cnt && args_cnt <= 5); + + for (i = 1; i < args_cnt; ++i) + { + if (V_VT(args+i) == VT_ERROR) continue; + if (V_VT(args+i) == VT_NULL) return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + if (FAILED(hres = to_int(args+i, &int_args.val[i-1]))) return hres; + } + + hres = VarFormatCurrency(args, int_args.s.num_dig, int_args.s.inc_lead, int_args.s.use_parens, + int_args.s.group, 0, &str); + if (FAILED(hres)) return hres; + + return return_bstr(res, str); } static HRESULT Global_FormatPercent(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0e47f428d09..391aa0b63fb 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2339,4 +2339,40 @@ end sub call testRandomize() call testRandomizeError() +sub testFormatCurrencyError() + on error resume next + dim x + call Err.clear() + x = FormatCurrency(null) + call ok(Err.number = 13, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatCurrency(1000,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatCurrency(1000,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatCurrency(1000,0,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + x = FormatCurrency(1000,0,0,0,null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) +end sub + +sub testFormatCurrency() + dim x + + x = FormatCurrency(0) + x = FormatCurrency(-1000,,,-1) + call ok(getVT(x) = "VT_BSTR*", "getVT = " & getVT(x)) +end sub + +call testFormatCurrency() +call testFormatCurrencyError() + Call reportSuccess()

1 0

Bernhard Kölbl : include: Add GUIDs for video decoder profiles.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: d95885ba0b5b7d27af7fb26e7ec467b515dcc5d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/d95885ba0b5b7d27af7fb26e7ec467… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Nov 16 13:04:51 2022 +0100 include: Add GUIDs for video decoder profiles. --- include/d3d11.idl | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 982f4abb8ae..1740ca6eac6 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1930,6 +1930,61 @@ typedef struct D3D11_TEXTURE3D_DESC UINT MiscFlags; } D3D11_TEXTURE3D_DESC; +/* + * + * D3D11 video decoder profiles + * + */ + +/* MPEG1 & MPEG2 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2_MOCOMP, 0xe6a9f44b,0x61b0,0x4563,0x9e,0xa4,0x63,0xd2,0xa3,0xc6,0xfe,0x66);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2_IDCT, 0xbf22ad00,0x03ea,0x4690,0x80,0x77,0x47,0x33,0x46,0x20,0x9b,0x7e);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2_VLD, 0xee27417f,0x5e28,0x4e65,0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG1_VLD, 0x6f3ec719,0x3735,0x42cc,0x80,0x63,0x65,0xcc,0x3c,0xb3,0x66,0x16);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG2and1_VLD, 0x86695f12,0x340e,0x4f04,0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60);") + +/* H264 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_MOCOMP_NOFGT, 0x1b81be64,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_MOCOMP_FGT, 0x1b81be65,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_IDCT_NOFGT, 0x1b81be66,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_IDCT_FGT, 0x1b81be67,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_NOFGT, 0x1b81be68,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_FGT, 0x1b81be69,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_WITHFMOASO_NOFGT, 0xd5f04ff9,0x3418,0x45d8,0x95,0x61,0x32,0xa7,0x6a,0xae,0x2d,0xdd);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_STEREO_PROGRESSIVE_NOFGT, 0xd79be8da,0x0cf1,0x4c81,0xb8,0x2a,0x69,0xa4,0xe2,0x36,0xf4,0x3d);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_STEREO_NOFGT, 0xf9aaccbb,0xc2b6,0x4cfc,0x87,0x79,0x57,0x07,0xb1,0x76,0x05,0x52);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_H264_VLD_MULTIVIEW_NOFGT, 0x705b9d82,0x76cf,0x49d6,0xb7,0xe6,0xac,0x88,0x72,0xdb,0x01,0x3c);") + +/* WMV8 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV8_POSTPROC, 0x1b81be80,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV8_MOCOMP, 0x1b81be81,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") + +/* WMV9 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV9_POSTPROC, 0x1b81be90,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV9_MOCOMP, 0x1b81be91,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_WMV9_IDCT, 0x1b81be94,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") + +/* VC1 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_POSTPROC, 0x1b81beA0,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_MOCOMP, 0x1b81beA1,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_IDCT, 0x1b81beA2,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_VLD, 0x1b81beA3,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VC1_D2010, 0x1b81beA4,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);") + +/* MPEG4 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_SIMPLE, 0xefd64d74,0xc9e8,0x41d7,0xa5,0xe9,0xe9,0xb0,0xe3,0x9f,0xa3,0x19);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_NOGMC, 0xed418a9f,0x010d,0x4eda,0x9a,0xe3,0x9a,0x65,0x35,0x8d,0x8d,0x2e);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_MPEG4PT2_VLD_ADVSIMPLE_GMC, 0xab998b5b,0x4258,0x44a9,0x9f,0xeb,0x94,0xe5,0x97,0xa6,0xba,0xae);") + +/* HVEC */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN, 0x5b11d51b,0x2f4c,0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10, 0x107af0e0,0xef1a,0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);") + +/* VP9 */ +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0, 0x463707f8,0xa1d0,0x4585,0x87,0x6d,0x83,0xaa,0x6d,0x60,0xb8,0x9e);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VP9_VLD_10BIT_PROFILE2, 0xa4c749ef,0x6ecf,0x48aa,0x84,0x48,0x50,0xa7,0xa1,0x16,0x5f,0xf7);") +cpp_quote("DEFINE_GUID(D3D11_DECODER_PROFILE_VP8_VLD, 0x90b899ea,0x3a62,0x4705,0x88,0xb3,0x8d,0xf0,0x4b,0x27,0x44,0xe7);") + typedef struct D3D11_VIDEO_DECODER_DESC { GUID Guid;

1 0

Eric Pouech : d3dx9_36/tests: Introduce union to help passing float values in DWORD.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 8c7ffd677e9645d60120ec70b5f5d0c862f44e7c URL: https://gitlab.winehq.org/wine/wine/-/commit/8c7ffd677e9645d60120ec70b5f5d0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 16 09:35:40 2022 +0100 d3dx9_36/tests: Introduce union to help passing float values in DWORD. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/tests/effect.c | 57 ++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 12af35cb8d8..9f4a8b7bc2e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5465,6 +5465,11 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) HRESULT hr; D3DXHANDLE param; unsigned int i, passes_count, value; + union + { + DWORD dw; + float f; + } float_value; int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader; @@ -5626,14 +5631,14 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[7].const_updated_mask, check_vconsts_parameters[7].param_name); - *(float *)&value = 9999.0f; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, value); + float_value.f = 9999.0f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts2"); @@ -5648,29 +5653,29 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &value); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(value == 0, "Unexpected fog density %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &value); + ok(float_value.f == 0, "Unexpected fog density %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 4.0f, "Unexpected fog start %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &value); + ok(float_value.f == 4.0f, "Unexpected fog start %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected point scale A %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &value); + ok(float_value.f == 9999.0f, "Unexpected point scale A %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected point scale B %g.\n", *(float *)&value); + ok(float_value.f == 9999.0f, "Unexpected point scale B %g.\n", float_value.f); test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[8].const_updated_mask, check_vconsts_parameters[8].param_name); - *(float *)&value = 9999.0f; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, value); + float_value.f = 9999.0f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts3"); @@ -5687,18 +5692,18 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &value); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected fog density %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &value); + ok(float_value.f == 9999.0f, "Unexpected fog density %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected fog start %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &value); + ok(float_value.f == 9999.0f, "Unexpected fog start %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 4.0f, "Unexpected point scale A %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &value); + ok(float_value.f == 4.0f, "Unexpected point scale A %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 12.0f, "Unexpected point scale B %g.\n", *(float *)&value); + ok(float_value.f == 12.0f, "Unexpected point scale B %g.\n", float_value.f); test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[11].const_updated_mask, check_vconsts_parameters[11].param_name);

1 0

Bartosz Kosiorek : msvcrt: Add _vcwprintf_l implementation.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 8590023041e7ff51966ecdda7a7e238633b84f4b URL: https://gitlab.winehq.org/wine/wine/-/commit/8590023041e7ff51966ecdda7a7e23… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Nov 6 00:41:46 2022 +0100 msvcrt: Add _vcwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 7 +++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index dc028bd932b..1d80726ee3a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1428,7 +1428,7 @@ @ stub _vcprintf_s @ stub _vcprintf_s_l @ cdecl _vcwprintf(wstr ptr) -@ stub _vcwprintf_l +@ cdecl _vcwprintf_l(wstr ptr ptr) @ stub _vcwprintf_p @ stub _vcwprintf_p_l @ stub _vcwprintf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1e46cf9983e..7f255a9414b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1785,7 +1785,7 @@ @ stub _vcprintf_s @ stub _vcprintf_s_l @ cdecl _vcwprintf(wstr ptr) -@ stub _vcwprintf_l +@ cdecl _vcwprintf_l(wstr ptr ptr) @ stub _vcwprintf_p @ stub _vcwprintf_p_l @ stub _vcwprintf_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 59b99a04a31..3c606ebf391 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1804,7 +1804,7 @@ @ stub _vcprintf_s @ stub _vcprintf_s_l @ cdecl _vcwprintf(wstr ptr) -@ stub _vcwprintf_l +@ cdecl _vcwprintf_l(wstr ptr ptr) @ stub _vcwprintf_p @ stub _vcwprintf_p_l @ stub _vcwprintf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5dbb83893e2..cf885153e7a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1108,7 +1108,7 @@ @ stub _vcprintf_s @ stub _vcprintf_s_l @ cdecl _vcwprintf(wstr ptr) -@ stub _vcwprintf_l +@ cdecl _vcwprintf_l(wstr ptr ptr) @ stub _vcwprintf_p @ stub _vcwprintf_p_l @ stub _vcwprintf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e67ea400657..87b31d1a048 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1083,7 +1083,7 @@ @ stub _vcprintf_s @ stub _vcprintf_s_l @ cdecl _vcwprintf(wstr ptr) -@ stub _vcwprintf_l +@ cdecl _vcwprintf_l(wstr ptr ptr) @ stub _vcwprintf_p @ stub _vcwprintf_p_l @ stub _vcwprintf_s diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 70df825866f..2c92f0b3811 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -555,6 +555,13 @@ int WINAPIV _cprintf(const char* format, ...) return retval; } +/********************************************************************* + * _vcwprintf_l (MSVCRT.@) + */ +int CDECL _vcwprintf_l(const wchar_t* format, _locale_t locale, va_list valist) +{ + return pf_printf_w(puts_clbk_console_w, NULL, format, locale, 0, arg_clbk_valist, NULL, &valist); +} /********************************************************************* * _vcwprintf (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a82adcb2951..6dcb0767c31 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1042,7 +1042,7 @@ # stub _vcprintf_s(str ptr) # stub _vcprintf_s_l(str ptr ptr) @ cdecl _vcwprintf(wstr ptr) -# stub _vcwprintf_l(wstr ptr ptr) +@ cdecl _vcwprintf_l(wstr ptr ptr) # stub _vcwprintf_p(wstr ptr) # stub _vcwprintf_p_l(wstr ptr ptr) # stub _vcwprintf_s(wstr ptr)

1 0

Bartosz Kosiorek : msvcrt: Add _vcprintf_l implementation.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: af7aaba0bfd98e48692650aa6739d0013d0d4f36 URL: https://gitlab.winehq.org/wine/wine/-/commit/af7aaba0bfd98e48692650aa6739d0… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Nov 6 00:33:04 2022 +0100 msvcrt: Add _vcprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 10 ++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 599d709cd18..dc028bd932b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1265,7 +1265,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) @ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) @@ -1422,7 +1422,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 10e3b6ca629..1e46cf9983e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1779,7 +1779,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index fdeb1496ea6..59b99a04a31 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1798,7 +1798,7 @@ @ cdecl _utime64(str ptr) @ cdecl _vacopy(ptr ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ac247640db7..5dbb83893e2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1102,7 +1102,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 053ccc6c212..e67ea400657 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1077,7 +1077,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -@ stub _vcprintf_l +@ cdecl _vcprintf_l(str ptr ptr) @ stub _vcprintf_p @ stub _vcprintf_p_l @ stub _vcprintf_s diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 2b47287c5c7..70df825866f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -522,6 +522,16 @@ static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str) return len; } +#if _MSVCR_VER<=120 +/********************************************************************* + * _vcprintf_l (MSVCRT.@) + */ +int CDECL _vcprintf_l(const char* format, _locale_t locale, va_list valist) +{ + return pf_printf_a(puts_clbk_console_a, NULL, format, locale, 0, arg_clbk_valist, NULL, &valist); +} +#endif + /********************************************************************* * _vcprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8a4a3c85cc7..a82adcb2951 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1036,7 +1036,7 @@ @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _vcprintf(str ptr) -# stub _vcprintf_l(str ptr ptr) +@ cdecl _vcprintf_l(str ptr ptr) # stub _vcprintf_p(str ptr) # stub _vcprintf_p_l(str ptr ptr) # stub _vcprintf_s(str ptr)

1 0

Eric Pouech : d3dx9_36/tests: Use correct integral type.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: c85141bcaefc763176a52c3d19e39cde32d465c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c85141bcaefc763176a52c3d19e39c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 16 09:35:42 2022 +0100 d3dx9_36/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/tests/effect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9f4a8b7bc2e..71c3da963c8 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5464,12 +5464,13 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ID3DXEffect *effect; HRESULT hr; D3DXHANDLE param; - unsigned int i, passes_count, value; + unsigned int i, passes_count; union { DWORD dw; float f; } float_value; + DWORD value; int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader;

1 0

Alexandros Frantzis : winevulkan: Generate "in_ext" definition on demand.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: ad7945eb41f7c8849655e785dfd8656af7c7ea6f URL: https://gitlab.winehq.org/wine/wine/-/commit/ad7945eb41f7c8849655e785dfd865… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Nov 16 13:47:59 2022 +0200 winevulkan: Generate "in_ext" definition on demand. There are cases in StructConversionFunction.definition where we will generate copy code for extension struct members, without emitting the definition of "in_ext" variable used in the copy code. This issue is triggered by mismatches in the condition that guards the generation of the "in_ext" definitions, and the condition(s) that govern the generation of the member copy code (e.g., in StructConversionFunction.member_needs_copy and VkMember.needs_conversion). In order to avoid such mismatches and the burden of having to keep the conditions in sync, this commit generates the definition on demand, by checking if it's actually needed by the member copy code. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winevulkan/make_vulkan | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3257481b746..8c0cd7bc8ec 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2199,20 +2199,25 @@ class StructConversionFunction(object): body += ident + "{0} *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext));\n".format(out_type) else: body += ident + "{0} *out_ext = find_next_struct(out_header, {1});\n".format(out_type, stype) - if self.direction == Direction.OUTPUT or not ext.returnedonly: - body += ident + "{0} *in_ext = ({0} *)in_header;\n".format(in_type) + + copy_body = "" for m in ext: if m.name == "sType": - body += ident + "out_ext->sType = {0};\n".format(stype) + copy_body += ident + "out_ext->sType = {0};\n".format(stype) continue if not self.member_needs_copy(ext, m): continue if m.name == "pNext": - body += ident + "out_ext->pNext = NULL;\n" + copy_body += ident + "out_ext->pNext = NULL;\n" continue - body += ident + m.copy("in_ext->", "out_ext->", self.direction, self.conv, True) + copy_body += ident + m.copy("in_ext->", "out_ext->", self.direction, self.conv, True) + + # Generate the definition of "in_ext" if we need it + if "in_ext->" in copy_body: + body += ident + "{0} *in_ext = ({0} *)in_header;\n".format(in_type) + body += copy_body if self.direction == Direction.INPUT: body += ident + "out_header->pNext = (void *)out_ext;\n"

1 0

Bartosz Kosiorek : msvcrt: Add _scwprintf_p implementation.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 69ce7894fbca359b0e8426a60e674cee4d3c1508 URL: https://gitlab.winehq.org/wine/wine/-/commit/69ce7894fbca359b0e8426a60e674c… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Nov 6 00:11:54 2022 +0100 msvcrt: Add _scwprintf_p implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bcc84c31a8b..10e3b6ca629 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1622,7 +1622,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) @ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1f69673502f..fdeb1496ea6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1633,7 +1633,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) @ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index eefac9d1089..2580e89c8b4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1359,7 +1359,7 @@ @ varargs _scprintf_p_l(str ptr) msvcr120._scprintf_p_l @ varargs _scwprintf(wstr) msvcr120._scwprintf @ varargs _scwprintf_l(wstr ptr) msvcr120._scwprintf_l -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) msvcr120._scwprintf_p @ varargs _scwprintf_p_l(wstr ptr) msvcr120._scwprintf_p_l @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) msvcr120._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) msvcr120._seh_longjmp_unwind diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1c8e3e6868b..ac247640db7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -943,7 +943,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) @ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 509193d63a6..053ccc6c212 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -919,7 +919,7 @@ @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) @ varargs _scwprintf_l(wstr ptr) -@ stub _scwprintf_p +@ varargs _scwprintf_p(wstr) @ varargs _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c10894e6753..60a15dfc29c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1647,6 +1647,22 @@ int WINAPIV _scwprintf_p_l( const wchar_t *format, _locale_t locale, ... ) return r; } +#if _MSVCR_VER>=80 +/********************************************************************* + * _scwprintf_p (MSVCRT.@) + */ +int WINAPIV _scwprintf_p( const wchar_t *format, ... ) +{ + va_list ap; + int r; + + va_start( ap, format ); + r = vswprintf_p_l_opt( NULL, INT_MAX, format, 0, NULL, ap ); + va_end( ap ); + return r; +} +#endif + /********************************************************************* * _scwprintf (MSVCRT.@) */

1 0

Jason Millard : vbscript: Update parser to allow statements after ELSE without new line.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 502df086eb87312174131648377be84a05d7f077 URL: https://gitlab.winehq.org/wine/wine/-/commit/502df086eb87312174131648377be8… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Nov 16 06:45:22 2022 -0500 vbscript: Update parser to allow statements after ELSE without new line. --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 42838d34f17..4b9d53d3bca 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -318,6 +318,7 @@ ElseIf Else_opt : /* empty */ { $$ = NULL; } | tELSE tNL StatementsNl_opt { $$ = $3; } + | tELSE StatementsNl_opt { $$ = $2; } CaseClausules : /* empty */ { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2467b814eff..61258355496 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -282,6 +282,14 @@ Else End If Call ok(x, "else not called?") +' Else without following newline +x = false +If false Then + Call ok(false, "inside if false") +Else x = true +End If +Call ok(x, "else not called?") + x = false If false Then Call ok(false, "inside if false")

1 0

Bartosz Kosiorek : msvcrt: Add _scwprintf_l implementation.
by Alexandre Julliard Nov. 16, 2022

Nov. 16, 2022

Module: wine Branch: master Commit: 1faad02cf1eb712fa2d57fc47298880da7ceba86 URL: https://gitlab.winehq.org/wine/wine/-/commit/1faad02cf1eb712fa2d57fc4729888… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sat Nov 5 23:39:47 2022 +0100 msvcrt: Add _scwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 8 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3fcdcb7121b..ebb79623048 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1264,7 +1264,7 @@ @ varargs _scprintf_p(str) @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) -@ stub _scwprintf_l +@ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 04f496b2fe1..64d680923c3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1621,7 +1621,7 @@ @ varargs _scprintf_p(str) @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) -@ stub _scwprintf_l +@ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 17cf2f87da4..ba16e61f397 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1632,7 +1632,7 @@ @ varargs _scprintf_p(str) @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) -@ stub _scwprintf_l +@ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b9e8bc0f7c8..468146ed056 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1358,7 +1358,7 @@ @ varargs _scprintf_p(str) msvcr120._scprintf_p @ varargs _scprintf_p_l(str ptr) msvcr120._scprintf_p_l @ varargs _scwprintf(wstr) msvcr120._scwprintf -@ stub _scwprintf_l +@ varargs _scwprintf_l(wstr ptr) msvcr120._scwprintf_l @ stub _scwprintf_p @ stub _scwprintf_p_l @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) msvcr120._seh_longjmp_unwind4 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index eda6232f3a3..49ea60e3dae 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -942,7 +942,7 @@ @ varargs _scprintf_p(str) @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) -@ stub _scwprintf_l +@ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 037292a3d58..d2cff259208 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -918,7 +918,7 @@ @ varargs _scprintf_p(str) @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) -@ stub _scwprintf_l +@ varargs _scwprintf_l(wstr ptr) @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f015fa4b22c..7a060f82769 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -888,7 +888,7 @@ @ varargs _scprintf_l(str ptr) @ varargs _scprintf_p_l(str ptr) @ varargs _scwprintf(wstr) -# stub _scwprintf_l(wstr ptr) +@ varargs _scwprintf_l(wstr ptr) # stub _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) @ cdecl _searchenv_s(str str ptr long) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c5696071846..4ef779cba58 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1619,6 +1619,20 @@ int WINAPIV sprintf_s( char *str, size_t num, const char *format, ... ) return r; } +/********************************************************************* + * _scwprintf_l (MSVCRT.@) + */ +int WINAPIV _scwprintf_l( const wchar_t *format, _locale_t locale, ... ) +{ + va_list ap; + int r; + + va_start( ap, locale ); + r = _vsnwprintf_l( NULL, INT_MAX, format, locale, ap ); + va_end( ap ); + return r; +} + /********************************************************************* * _scwprintf (MSVCRT.@) */

1 0