December 2018 - Wine-Commits

Józef Kucia : d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 7aa4d276810c9ca05c8cd605152e7c6194f5a78a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa4d276810c9ca05c8cd605… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 14:41:07 2018 +0100 d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 385c70d..d978827 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,15 +132,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; }

1 0

Zebediah Figura : wined3d: Use wined3d_state_get_light() in wined3d_state_record_lights().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 9f85d5dab0b17f53ec05f7706ea20b601b1aaf33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f85d5dab0b17f53ec05f770… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 2 18:28:37 2018 -0600 wined3d: Use wined3d_state_get_light() in wined3d_state_record_lights(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0b2ce50..9539ae0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -622,6 +622,8 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { + const struct wined3d_light_info *src; + struct wined3d_light_info *dst; UINT i; /* Lights... For a recorded state block, we just had a chain of actions @@ -629,48 +631,36 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s * differ. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) { - struct list *e, *f; - LIST_FOR_EACH(e, &dst_state->light_map[i]) + LIST_FOR_EACH_ENTRY(dst, &dst_state->light_map[i], struct wined3d_light_info, entry) { - BOOL updated = FALSE; - struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; - - /* Look up the light in the destination */ - LIST_FOR_EACH(f, &src_state->light_map[i]) + if ((src = wined3d_state_get_light(src_state, dst->OriginalIndex))) { - realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); - if (realLight->OriginalIndex == src->OriginalIndex) + dst->OriginalParms = src->OriginalParms; + + if (src->glIndex == -1 && dst->glIndex != -1) { - src->OriginalParms = realLight->OriginalParms; - - if (realLight->glIndex == -1 && src->glIndex != -1) - { - /* Light disabled */ - dst_state->lights[src->glIndex] = NULL; - } - else if (realLight->glIndex != -1 && src->glIndex == -1) - { - /* Light enabled */ - dst_state->lights[realLight->glIndex] = src; - } - src->glIndex = realLight->glIndex; - updated = TRUE; - break; + /* Light disabled. */ + dst_state->lights[dst->glIndex] = NULL; } + else if (src->glIndex != -1 && dst->glIndex == -1) + { + /* Light enabled. */ + dst_state->lights[src->glIndex] = dst; + } + dst->glIndex = src->glIndex; } - - if (!updated) + else { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ WARN("Light %u in dst_state %p does not exist in src_state %p.\n", - src->OriginalIndex, dst_state, src_state); + dst->OriginalIndex, dst_state, src_state); - src->OriginalParms = WINED3D_default_light; - if (src->glIndex != -1) + dst->OriginalParms = WINED3D_default_light; + if (dst->glIndex != -1) { - dst_state->lights[src->glIndex] = NULL; - src->glIndex = -1; + dst_state->lights[dst->glIndex] = NULL; + dst->glIndex = -1; } } }

1 0

Austin English : ntdll: Add RtlAddGrowableFunctionTable stub.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 80991720def8d597332bcd61fcb49c00f0feaa21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80991720def8d597332bcd61… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 3 00:29:21 2018 -0700 ntdll: Add RtlAddGrowableFunctionTable stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 12 ++++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 4 files changed, 35 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f..1f3aeaa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb..72087a2 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4d2d127..22a861d 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -977,6 +977,18 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb..3f886a7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */

1 0

Daniel Lehman : wininet: Always check if context can be deleted when freeing netconn.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 9678045056e925022e28224e74c359a9b25d6cd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9678045056e925022e28224e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Dec 2 19:49:24 2018 -0800 wininet: Always check if context can be deleted when freeing netconn. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/netconnection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad2217..615a43c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -392,9 +392,9 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - if (SecIsValidHandle(&netconn->ssl_ctx)) - DeleteSecurityContext(&netconn->ssl_ctx); } + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); close_netconn(netconn); heap_free(netconn);

1 0

Michael Stefaniuc : shell32/tests: Remove redundant NULL check before CoTaskMemFree().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 0cc6233e2077c1ef679ecb8bd815d31484868294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc6233e2077c1ef679ecb8b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 3 21:40:31 2018 +0100 shell32/tests: Remove redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 33a5e64..0da164b 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -490,7 +490,7 @@ static void check_dropdown_(const char *file, UINT line, IAutoCompleteDropDown * else ok_(file, line)(str == NULL, "Expected (null), got %s\n", wine_dbgstr_w(str)); } - if (str) CoTaskMemFree(str); + CoTaskMemFree(str); } }

1 0

Alex Henrie : ntdll: Add RtlGrowFunctionTable stub.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: c9109309c8fe3887cbbfc80986a8bdfcbd2ca572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9109309c8fe3887cbbfc809… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 00:29:22 2018 -0700 ntdll: Add RtlGrowFunctionTable stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 8 ++++++++ dlls/ntdll/signal_arm64.c | 9 +++++++++ dlls/ntdll/signal_x86_64.c | 9 +++++++++ 4 files changed, 27 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1f3aeaa..3741eb9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -683,6 +683,7 @@ @ stdcall RtlGetUnloadEventTrace() @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) +@ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) @ stub RtlGuidToPropertySetName @ stdcall RtlHashUnicodeString(ptr long long ptr) @ stdcall RtlIdentifierAuthoritySid(ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 72087a2..88914cd 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1069,6 +1069,14 @@ DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functi return S_OK; } +/************************************************************************* + * RtlGrowFunctionTable (NTDLL.@) + */ +void WINAPI RtlGrowFunctionTable( void *table, DWORD count ) +{ + FIXME( "(%p, %d) stub!\n", table, count ); +} + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 22a861d..c976884 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -989,6 +989,15 @@ DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functi } +/************************************************************************* + * RtlGrowFunctionTable (NTDLL.@) + */ +void WINAPI RtlGrowFunctionTable( void *table, DWORD count ) +{ + FIXME( "(%p, %d) stub!\n", table, count ); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3f886a7..0e515ff 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3518,6 +3518,15 @@ DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functi } +/************************************************************************* + * RtlGrowFunctionTable (NTDLL.@) + */ +void WINAPI RtlGrowFunctionTable( void *table, DWORD count ) +{ + FIXME( "(%p, %d) stub!\n", table, count ); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */

1 0

Józef Kucia : d3d9: Do not touch output parameter when d3d9_GetAdapterIdentifier() fails.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 133d0668b69422b3f6964bddabba9476e7f8a585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133d0668b69422b3f6964bdd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 14:41:09 2018 +0100 d3d9: Do not touch output parameter when d3d9_GetAdapterIdentifier() fails. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4fbf5e9..3f9c188 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,15 +137,16 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + } return hr; }

1 0

Józef Kucia : d3d9: Do not touch output parameter when d3d9_GetAdapterLUID() fails.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 0035b1109c344b1f18a5ae83711fec81e2877e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0035b1109c344b1f18a5ae83… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 14:41:08 2018 +0100 d3d9: Do not touch output parameter when d3d9_GetAdapterLUID() fails. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 242e36d..4fbf5e9 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -542,9 +542,8 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.description_size = 0; adapter_id.device_name_size = 0; - hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id); - - *luid = adapter_id.adapter_luid; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id))) + *luid = adapter_id.adapter_luid; return hr; }

1 0

Dmitry Timoshkov : crypt32: Pass type and flags in correct order to the find() helper.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: ee883ff6596b5315da60b55e7eeb865a9cbb42a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee883ff6596b5315da60b55e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 3 18:14:08 2018 +0300 crypt32: Pass type and flags in correct order to the find() helper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d7ef42..e591c4d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1811,7 +1811,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, } if (find) - ret = find(hCertStore, dwFlags, dwType, pvPara, pPrevCertContext); + ret = find(hCertStore, dwType, dwFlags, pvPara, pPrevCertContext); else if (compare) ret = cert_compare_certs_in_store(hCertStore, pPrevCertContext, compare, dwType, dwFlags, pvPara);

1 0

Dmitry Timoshkov : crypt32: Use sizeof(WCHAR) instead of 2.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: f4845059b634ffd3fc96169c06a1e7ebb0ff133c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4845059b634ffd3fc96169c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 3 18:13:47 2018 +0300 crypt32: Use sizeof(WCHAR) instead of 2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 06d456a..e70940a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1550,7 +1550,7 @@ static BOOL CRYPT_AsnDecodeNameValueInternal(const BYTE *pbEncoded, case ASN_UTF8STRING: valueType = CERT_RDN_UTF8_STRING; bytesNeeded += MultiByteToWideChar(CP_UTF8, 0, - (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * 2; + (LPCSTR)pbEncoded + 1 + lenBytes, dataLen, NULL, 0) * sizeof(WCHAR); break; default: SetLastError(CRYPT_E_ASN1_BADTAG);

1 0