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

Andrew Eikum : winegcc: Pass -static-libstdc++ to the linker.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 590ccd0f5ce03dd2417d6ea057459f073a556ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=590ccd0f5ce03dd2417d6ea0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 09:05:14 2018 -0600 winegcc: Pass -static-libstdc++ to the linker. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3..b5fa881 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j;

1 0

Zebediah Figura : setupapi: Delete all empty parent keys of a removed device key.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 8fff6eeb76a22bd21888e592f0646362cbac7934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fff6eeb76a22bd21888e592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:13 2018 -0600 setupapi: Delete all empty parent keys of a removed device key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 17 +++++++++++++++++ dlls/setupapi/tests/devinst.c | 31 ------------------------------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5ae3fbd..82a45b4 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -578,7 +578,9 @@ static void remove_device_iface(struct device_iface *iface) static void remove_device(struct device *device) { + WCHAR id[MAX_DEVICE_ID_LEN], *p; struct device_iface *iface; + HKEY enum_key; LIST_FOR_EACH_ENTRY(iface, &device->interfaces, struct device_iface, entry) { @@ -587,6 +589,21 @@ static void remove_device(struct device *device) RegDeleteTreeW(device->key, NULL); RegDeleteKeyW(device->key, emptyW); + + /* delete all empty parents of the key */ + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, 0, &enum_key)) + { + strcpyW(id, device->instanceId); + + while ((p = strrchrW(id, '\\'))) + { + *p = 0; + RegDeleteKeyW(enum_key, id); + } + + RegCloseKey(enum_key); + } + RegCloseKey(device->key); device->key = NULL; device->removed = TRUE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 07e082b..29f12c3 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -466,9 +466,6 @@ static void test_get_device_instance_id(void) static void test_register_device_info(void) { - static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'E','n','u','m','\\','R','o','o','t','\\','L','E','G','A','C','Y','_','B','O','G','U','S',0}; SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; @@ -526,9 +523,6 @@ static void test_register_device_info(void) ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); - - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, @@ -662,10 +656,6 @@ static void test_device_iface(void) static void test_device_iface_detail(void) { - static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'E','n','u','m','\\','R','o','o','t','\\', - 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -737,9 +727,6 @@ static void test_device_iface_detail(void) heap_free(detail); SetupDiDestroyDeviceInfoList(set); - - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void test_device_key(void) @@ -849,7 +836,6 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } @@ -890,9 +876,6 @@ static void test_register_device_iface(void) SetupDiDestroyDeviceInfoList(set); SetupDiDestroyDeviceInfoList(set2); - - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void test_registry_property_a(void) @@ -992,14 +975,7 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); -todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); - /* FIXME: Remove when Wine is fixed */ - if (res == ERROR_SUCCESS) - { - /* Wine doesn't delete the information currently */ - RegDeleteKeyA(HKEY_LOCAL_MACHINE, bogus); - } } static void test_registry_property_w(void) @@ -1103,14 +1079,7 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); -todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); - /* FIXME: Remove when Wine is fixed */ - if (res == ERROR_SUCCESS) - { - /* Wine doesn't delete the information currently */ - RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus); - } } static void test_get_inf_class(void)

1 0

Alex Henrie : wsdapi: Turn a constant and several variables into static constants.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 133af46568ca0fac1dc37be43caa0903f2ad58ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=133af46568ca0fac1dc37be4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:06:51 2018 -0700 wsdapi: Turn a constant and several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 6 +++--- dlls/wsdapi/xml.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index e123398..2ecc013 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -364,7 +364,7 @@ HRESULT register_namespaces(IWSDXMLContext *xml_context) static BOOL create_guid(LPWSTR buffer) { - const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; + static const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; WCHAR* uuidString = NULL; UUID uuid; @@ -401,7 +401,7 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) { - WCHAR formatString[] = { '%','I','6','4','u', 0 }; + static const WCHAR formatString[] = { '%','I','6','4','u', 0 }; LPWSTR ret; ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); @@ -560,7 +560,7 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) { - WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + static const WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; LPWSTR current_buf_pos = buffer; size_t memory_needed = 0; const WSD_NAME_LIST *cur = list; diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 98bdec6..727d83a 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -380,7 +380,7 @@ static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) static LPWSTR generate_namespace_prefix(IWSDXMLContextImpl *impl, void *parentMemoryBlock, LPCWSTR uri) { - WCHAR formatString[] = { 'u','n','%','d', 0 }; + static const WCHAR formatString[] = { 'u','n','%','d', 0 }; WCHAR suggestedPrefix[7]; /* Find a unique prefix */

1 0

Nikolay Sivov : gdi32: Fix function prototype when building without freetype.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: cfcfcadfcbd11b142799b55fae94fdf64bcf3152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfcfcadfcbd11b142799b55f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:39:47 2018 +0300 gdi32: Fix function prototype when building without freetype. 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> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 87c55e0..e07aada 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9168,7 +9168,7 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, vo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed) { *needed = 0; return FALSE;

1 0

Alex Henrie : winspool.drv: Make constant 'fmtW' static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 4761c367e09f9268978388a5ce89459c8b476af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4761c367e09f9268978388a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:06:39 2018 -0700 winspool.drv: Make constant 'fmtW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb268a0..e91138d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8208,8 +8208,8 @@ end: */ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { + static const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; WCHAR *cmd; - const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; BOOL r; cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW));

1 0

Nikolay Sivov : shlwapi: Forward SHOpenRegStream2() to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: cd77c562bb0be19cfc868f3dfcc0739db659adaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd77c562bb0be19cfc868f3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:58 2018 +0300 shlwapi: Forward SHOpenRegStream2() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 129 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 2 insertions(+), 131 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 102d6b7..31df82a 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -397,135 +397,6 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) } /************************************************************************* - * SHOpenRegStream2A [SHLWAPI.@] - * - * Create a stream to read binary registry data. - * - * PARAMS - * hKey [I] Registry handle - * pszSubkey [I] The sub key name - * pszValue [I] The value name under the sub key - * dwMode [I] Unused - * - * RETURNS - * Success: An IStream interface referring to the registry data - * Failure: NULL, if the registry key could not be opened or is not binary. - */ -IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, - LPCSTR pszValue,DWORD dwMode) -{ - ISHRegStream *tmp; - HKEY hStrKey = NULL; - LPBYTE lpBuff = NULL; - DWORD dwLength = 0; - LONG ret; - - TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); - - if (dwMode == STGM_READ) - ret = RegOpenKeyExA(hKey, pszSubkey, 0, KEY_READ, &hStrKey); - else /* in write mode we make sure the subkey exits */ - ret = RegCreateKeyExA(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - - if (ret == ERROR_SUCCESS) - { - if (dwMode == STGM_READ || dwMode == STGM_READWRITE) - { - /* read initial data */ - ret = RegQueryValueExA(hStrKey, pszValue, 0, 0, 0, &dwLength); - if (ret == ERROR_SUCCESS && dwLength) - { - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - RegQueryValueExA(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); - } - } - - if (!dwLength) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - - tmp = IStream_Create(hStrKey, lpBuff, dwLength); - if(tmp) - { - if(pszValue) - { - int len = lstrlenA(pszValue) + 1; - tmp->u.keyNameA = HeapAlloc(GetProcessHeap(), 0, len); - memcpy(tmp->u.keyNameA, pszValue, len); - } - - tmp->dwMode = dwMode; - tmp->bUnicode = FALSE; - return &tmp->IStream_iface; - } - } - - HeapFree(GetProcessHeap(), 0, lpBuff); - if (hStrKey) - RegCloseKey(hStrKey); - return NULL; -} - -/************************************************************************* - * SHOpenRegStream2W [SHLWAPI.@] - * - * See SHOpenRegStream2A. - */ -IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, - LPCWSTR pszValue, DWORD dwMode) -{ - ISHRegStream *tmp; - HKEY hStrKey = NULL; - LPBYTE lpBuff = NULL; - DWORD dwLength = 0; - LONG ret; - - TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), - debugstr_w(pszValue), dwMode); - - if (dwMode == STGM_READ) - ret = RegOpenKeyExW(hKey, pszSubkey, 0, KEY_READ, &hStrKey); - else /* in write mode we make sure the subkey exits */ - ret = RegCreateKeyExW(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - - if (ret == ERROR_SUCCESS) - { - if (dwMode == STGM_READ || dwMode == STGM_READWRITE) - { - /* read initial data */ - ret = RegQueryValueExW(hStrKey, pszValue, 0, 0, 0, &dwLength); - if (ret == ERROR_SUCCESS && dwLength) - { - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - RegQueryValueExW(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); - } - } - - if (!dwLength) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - - tmp = IStream_Create(hStrKey, lpBuff, dwLength); - if(tmp) - { - if(pszValue) - { - int len = lstrlenW(pszValue) + 1; - tmp->u.keyNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(tmp->u.keyNameW, pszValue, len * sizeof(WCHAR)); - } - - tmp->dwMode = dwMode; - tmp->bUnicode = TRUE; - return &tmp->IStream_iface; - } - } - - HeapFree(GetProcessHeap(), 0, lpBuff); - if (hStrKey) - RegCloseKey(hStrKey); - return NULL; -} - -/************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * * Create an IStream object on a block of memory. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f9e2570..9c01c3f 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -705,8 +705,8 @@ @ stdcall SHGetValueA ( long str str ptr ptr ptr ) @ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) @ stdcall SHIsLowMemoryMachine(long) -@ stdcall SHOpenRegStream2A(long str str long) -@ stdcall SHOpenRegStream2W(long wstr wstr long) +@ stdcall SHOpenRegStream2A(long str str long) shcore.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W @ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA @ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW @ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr)

1 0

Nikolay Sivov : shlwapi: Forward IStream helpers to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 77a8ac36838131d39f8345de014bd1447807acb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a8ac36838131d39f8345de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:59 2018 +0300 shlwapi: Forward IStream helpers to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 112 +--------------------------------------------- dlls/shlwapi/shlwapi.spec | 8 ++-- 2 files changed, 6 insertions(+), 114 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index ba9874b..37fa4c6 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -35,35 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* - * @ [SHLWAPI.184] - * - * Call IStream_Read() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvDest [O] Destination for data read - * ulSize [I] Size of data to read - * - * RETURNS - * Success: S_OK. ulSize bytes have been read from the stream into lpvDest. - * Failure: An HRESULT error code, or E_FAIL if the read succeeded but the - * number of bytes read does not match. - */ -HRESULT WINAPI SHIStream_Read(IStream *lpStream, LPVOID lpvDest, ULONG ulSize) -{ - ULONG ulRead; - HRESULT hRet; - - TRACE("(%p,%p,%u)\n", lpStream, lpvDest, ulSize); - - hRet = IStream_Read(lpStream, lpvDest, ulSize, &ulRead); - - if (SUCCEEDED(hRet) && ulRead != ulSize) - hRet = E_FAIL; - return hRet; -} - -/************************************************************************* * @ [SHLWAPI.166] * * Determine if a stream has 0 length. @@ -91,10 +62,10 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } else { - DWORD dwDummy; + DWORD dummy, read_len; /* Try to read from the stream */ - if(SUCCEEDED(SHIStream_Read(lpStream, &dwDummy, sizeof(dwDummy)))) + if (SUCCEEDED(IStream_Read(lpStream, &dummy, sizeof(dummy), &read_len)) && read_len == sizeof(dummy)) { LARGE_INTEGER zero; zero.QuadPart = 0; @@ -105,82 +76,3 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } return bRet; } - -/************************************************************************* - * @ [SHLWAPI.212] - * - * Call IStream_Write() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvSrc [I] Source for data to write - * ulSize [I] Size of data - * - * RETURNS - * Success: S_OK. ulSize bytes have been written to the stream from lpvSrc. - * Failure: An HRESULT error code, or E_FAIL if the write succeeded but the - * number of bytes written does not match. - */ -HRESULT WINAPI SHIStream_Write(IStream *lpStream, LPCVOID lpvSrc, ULONG ulSize) -{ - ULONG ulWritten; - HRESULT hRet; - - TRACE("(%p,%p,%d)\n", lpStream, lpvSrc, ulSize); - - hRet = IStream_Write(lpStream, lpvSrc, ulSize, &ulWritten); - - if (SUCCEEDED(hRet) && ulWritten != ulSize) - hRet = E_FAIL; - - return hRet; -} - -/************************************************************************* - * @ [SHLWAPI.213] - * - * Seek to the start of a stream. - * - * PARAMS - * lpStream [I] IStream object - * - * RETURNS - * Success: S_OK. The current position within the stream is updated - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Reset(IStream *lpStream) -{ - LARGE_INTEGER zero; - TRACE("(%p)\n", lpStream); - zero.QuadPart = 0; - return IStream_Seek(lpStream, zero, 0, NULL); -} - -/************************************************************************* - * @ [SHLWAPI.214] - * - * Get the size of a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpulSize [O] Destination for size - * - * RETURNS - * Success: S_OK. lpulSize contains the size of the stream. - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Size(IStream *lpStream, ULARGE_INTEGER* lpulSize) -{ - STATSTG statstg; - HRESULT hRet; - - TRACE("(%p,%p)\n", lpStream, lpulSize); - - memset(&statstg, 0, sizeof(statstg)); - - hRet = IStream_Stat(lpStream, &statstg, 1); - - if (SUCCEEDED(hRet) && lpulSize) - *lpulSize = statstg.cbSize; - return hRet; -} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9c01c3f..6e64a9c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -181,7 +181,7 @@ 181 stdcall -noname SHEnableMenuItem(long long long) 182 stdcall -noname SHCheckMenuItem(long long long) 183 stdcall -noname SHRegisterClassA(ptr) -184 stdcall -ordinal IStream_Read(ptr ptr long) SHIStream_Read +184 stdcall -ordinal IStream_Read(ptr ptr long) shcore.IStream_Read 185 stdcall -ordinal SHMessageBoxCheckA(ptr str str long long str) 186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) @@ -209,9 +209,9 @@ 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) 211 stdcall -noname FDSA_DeleteItem(ptr long) -212 stdcall -ordinal IStream_Write(ptr ptr long) SHIStream_Write -213 stdcall -ordinal IStream_Reset(ptr) -214 stdcall -ordinal IStream_Size(ptr ptr) +212 stdcall -ordinal IStream_Write(ptr ptr long) shcore.IStream_Write +213 stdcall -ordinal IStream_Reset(ptr) shcore.IStream_Reset +214 stdcall -ordinal IStream_Size(ptr ptr) shcore.IStream_Size 215 stdcall -ordinal SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr)

1 0

Roberto Pungartnik : po: Portuguese (Brazil) translation fixes.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: f29c09dce2a4f2e75424588677b83d6a7d341348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f29c09dce2a4f2e754245886… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 2 22:35:56 2018 -0200 po: Portuguese (Brazil) translation fixes. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik2gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 77 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f29c09dce2a4f2e75424…

1 0

Nikolay Sivov : user32/listbox: Use helper to test for selected state on painting.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 47058436426a306e7db8124508346204ee5865c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47058436426a306e7db81245… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:07 2018 +0300 user32/listbox: Use helper to test for selected state on painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3eee691..6dbf8d9 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -516,7 +516,13 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { LB_ITEMDATA *item = NULL; - if (index < descr->nb_items) item = &descr->items[index]; + BOOL selected = FALSE; + + if (index < descr->nb_items) + { + item = &descr->items[index]; + selected = is_item_selected(descr, index); + } if (IS_OWNERDRAW(descr)) { @@ -547,7 +553,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item->selected) dis.itemState |= ODS_SELECTED; + if (selected) + dis.itemState |= ODS_SELECTED; if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; @@ -570,7 +577,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, DrawFocusRect( hdc, rect ); return; } - if (item && item->selected) + if (selected) { oldBk = SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -595,7 +602,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, item->str, strlenW(item->str), descr->nb_tabs, descr->tabs, 0); } - if (item && item->selected) + if (selected) { SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText );

1 0

Alexandre Julliard : wineandroid: Specify the window scale directly in the constructor.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 357c2bb9f984122f06f9d9a75c004ff05c1b625e URL: https://source.winehq.org/git/wine.git/?a=commit;h=357c2bb9f984122f06f9d9a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:48 2018 +0100 wineandroid: Specify the window scale directly in the constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 8013b3a..6e6bbff 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -348,16 +348,16 @@ public class WineActivity extends Activity protected WineWindowGroup window_group; protected WineWindowGroup client_group; - public WineWindow( int w, WineWindow parent ) + public WineWindow( int w, WineWindow parent, float scale ) { Log.i( LOGTAG, String.format( "create hwnd %08x", w )); hwnd = w; owner = 0; style = 0; - scale = 1.0f; visible = false; visible_rect = client_rect = new Rect( 0, 0, 0, 0 ); this.parent = parent; + this.scale = scale; children = new ArrayList<WineWindow>(); win_map.put( w, this ); if (parent != null) parent.children.add( this ); @@ -744,11 +744,11 @@ public class WineActivity extends Activity public TopView( Context context, int hwnd ) { super( context ); - desktop_window = new WineWindow( hwnd, null ); + desktop_window = new WineWindow( hwnd, null, 1.0f ); addView( desktop_window.create_whole_view() ); desktop_window.client_group.bringToFront(); - message_window = new WineWindow( WineWindow.HWND_MESSAGE, null ); + message_window = new WineWindow( WineWindow.HWND_MESSAGE, null, 1.0f ); message_window.create_window_groups(); } @@ -786,8 +786,7 @@ public class WineActivity extends Activity WineWindow win = get_window( hwnd ); if (win == null) { - win = new WineWindow( hwnd, get_window( parent )); - win.scale = scale; + win = new WineWindow( hwnd, get_window( parent ), scale ); win.create_window_groups(); if (win.parent == desktop_window) win.create_whole_view(); }

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper function to check the selection state of an item.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 3b087ce81faa102290f538cd6a0e2da251a9e464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b087ce81faa102290f538cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:06 2018 +0300 user32/listbox: Use a helper function to check the selection state of an item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b..3eee691 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE );

1 0

Nikolay Sivov : shlwapi: Forward SHCreateMemStream() to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: ee235188552e38d43721186d3c98040fc126e28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee235188552e38d43721186d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:56 2018 +0300 shlwapi: Forward SHCreateMemStream() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 40 ---------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 63615d3..47e9317 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -633,46 +633,6 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, } /************************************************************************* - * @ [SHLWAPI.12] - * - * Create an IStream object on a block of memory. - * - * PARAMS - * lpbData [I] Memory block to create the IStream object on - * dwDataLen [I] Length of data block - * - * RETURNS - * Success: A pointer to the IStream object. - * Failure: NULL, if any parameters are invalid or an error occurs. - * - * NOTES - * A copy of the memory pointed to by lpbData is made, and is freed - * when the stream is released. - */ -IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) -{ - ISHRegStream *strm = NULL; - LPBYTE lpbDup; - - TRACE("(%p,%d)\n", lpbData, dwDataLen); - - if (!lpbData) - dwDataLen = 0; - - lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - strm = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!strm) - HeapFree(GetProcessHeap(), 0, lpbDup); - } - return &strm->IStream_iface; -} - -/************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * * Create an IStream object on a block of memory. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 62ebb85..ddc76ec 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -ordinal SHCreateMemStream(ptr long) shcore.SHCreateMemStream 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr)

1 0

Alexandre Julliard : wineandroid: Generate assets checksum from the gradle build file.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 0f19685917a9bc5cce2b581fc31d4bb90f8f2003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f19685917a9bc5cce2b581f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:27 2018 +0100 wineandroid: Generate assets checksum from the gradle build file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 8 ++------ dlls/wineandroid.drv/build.gradle.in | 39 +++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index d2e2d01..40ab495 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -20,9 +20,5 @@ EXTRA_TARGETS = wine-debug.apk all: wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg - (test -d assets && \ - rm -f assets/files.sum assets/sums.sum && \ - sha256sum `find assets -type f -print` | sed 's/ assets\// /' >files.sum && \ - sha256sum files.sum >sums.sum && \ - mv files.sum sums.sum assets) || rm -rf assets - gradle -q assembleDebug && mv build/outputs/apk/wine-debug.apk . + gradle -q assembleDebug + mv build/outputs/apk/wine-debug.apk $@ diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 3fba34a..8ae2fb4 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -32,7 +32,8 @@ buildscript } } -def add_icon_task( dir, scale ) { +def add_icon_task( dir, scale ) +{ return tasks.create( "createIcon-" + dir, Exec ) { def outdir = new File( "res", "drawable-" + dir ) outputs.dir( outdir ) @@ -45,15 +46,33 @@ def add_icon_task( dir, scale ) { } } -tasks.whenTaskAdded { t -> - if (t.name.equals( "generateDebugResources" )) { - t.dependsOn add_icon_task( "ldpi", 0.75 ) - t.dependsOn add_icon_task( "mdpi", 1 ) - t.dependsOn add_icon_task( "hdpi", 1.5 ) - t.dependsOn add_icon_task( "xhdpi", 2 ) - t.dependsOn add_icon_task( "xxhdpi", 3 ) - t.dependsOn add_icon_task( "xxxhdpi", 4 ) - } +def checksum_task() +{ + return tasks.create( "checksumAssets", Exec ) { + commandLine "sh", "-c", + "(test -d assets && " + + "rm -f assets/files.sum assets/sums.sum && " + + "sha256sum \$(find assets -type f -print) | sed 's/ assets\\// /' >files.sum && " + + "sha256sum files.sum >sums.sum && " + + "mv files.sum sums.sum assets) || rm -rf assets"; + } +} + +tasks.whenTaskAdded +{ + if (name.equals( "generateDebugResources" )) + { + dependsOn add_icon_task( "ldpi", 0.75 ) + dependsOn add_icon_task( "mdpi", 1 ) + dependsOn add_icon_task( "hdpi", 1.5 ) + dependsOn add_icon_task( "xhdpi", 2 ) + dependsOn add_icon_task( "xxhdpi", 3 ) + dependsOn add_icon_task( "xxxhdpi", 4 ) + } + if (name.equals( "generateDebugAssets" )) + { + dependsOn checksum_task() + } } tasks.withType(JavaCompile)

1 0

Alexandre Julliard : wineandroid: Add a helper function to update a window surface.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: cc06703e3abc8617ae4a3dff4024d06e235a2293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc06703e3abc8617ae4a3dff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 18:26:50 2018 +0100 wineandroid: Add a helper function to update a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 6e6bbff..9229955 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -530,6 +530,20 @@ public class WineActivity extends Activity return hwnd; } + private void update_surface( boolean is_client ) + { + if (is_client) + { + Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); + if (client_surface != null) wine_surface_changed( hwnd, client_surface, true ); + } + else + { + Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); + if (window_surface != null) wine_surface_changed( hwnd, window_surface, false ); + } + } + public void set_surface( SurfaceTexture surftex, boolean is_client ) { if (is_client) @@ -540,8 +554,6 @@ public class WineActivity extends Activity client_surftex = surftex; client_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); - wine_surface_changed( hwnd, client_surface, true ); } else { @@ -551,9 +563,8 @@ public class WineActivity extends Activity window_surftex = surftex; window_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); - wine_surface_changed( hwnd, window_surface, false ); } + update_surface( is_client ); } public void get_event_pos( MotionEvent event, int[] pos )

1 0

Dmitry Timoshkov : oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo: :Invoke implementation.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 54d17b95326851a685d0bac253129c0fd428901d URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d17b95326851a685d0bac2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Dec 2 10:34:44 2018 +0300 oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 3 ++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 756cca8..0b6776b 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2861,7 +2861,7 @@ static void test_typelibmarshal(void) ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - /* call DoSomething */ + /* call DoSomething without optional arguments */ VariantInit(&vararg[0]); VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_R8; @@ -2876,6 +2876,43 @@ static void test_typelibmarshal(void) ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); VariantClear(&varresult); + /* call DoSomething with optional argument set to VT_EMPTY */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_R8; + V_R8(&vararg[2]) = 3.141; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 3; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional arguments set to VT_ERROR/DISP_E_PARAMNOTFOUND */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_R8; + V_R8(&vararg[3]) = 3.141; + V_VT(&vararg[1]) = VT_ERROR; + V_ERROR(&vararg[1]) = DISP_E_PARAMNOTFOUND; + V_VT(&vararg[0]) = VT_ERROR; + V_ERROR(&vararg[0]) = DISP_E_PARAMNOTFOUND; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + /* call get_State */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f32bed3..f17a926 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7217,7 +7217,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else if (src_arg) + else if (src_arg && !((wParamFlags & PARAMFLAG_FOPT) && + V_VT(src_arg) == VT_ERROR && V_ERROR(src_arg) == DISP_E_PARAMNOTFOUND)) { TRACE("%s\n", debugstr_variant(src_arg));

1 0

Alex Henrie : shlwapi: Turn several constants and variables into static constants.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 94f08b1019401ba61ba019608bc93a47d3bc1a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f08b1019401ba61ba01960… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:05:32 2018 -0700 shlwapi: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 8313b98..fb38920 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -746,26 +746,24 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, * the last leaf starting from the '#'. Otherwise the '#' is not * meaningful and just start looking from the end. */ if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { - const WCHAR htmlW[] = {'.','h','t','m','l',0}; - const int len_htmlW = 5; - const WCHAR htmW[] = {'.','h','t','m',0}; - const int len_htmW = 4; + static const WCHAR htmlW[] = {'.','h','t','m','l'}; + static const WCHAR htmW[] = {'.','h','t','m'}; if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; - else if (work - base.pszSuffix > len_htmW) { - work -= len_htmW; - if (strncmpiW(work, htmW, len_htmW) == 0) + else if (work - base.pszSuffix > ARRAY_SIZE(htmW)) { + work -= ARRAY_SIZE(htmW); + if (strncmpiW(work, htmW, ARRAY_SIZE(htmW)) == 0) manual_search = TRUE; - work += len_htmW; + work += ARRAY_SIZE(htmW); } if (!manual_search && - work - base.pszSuffix > len_htmlW) { - work -= len_htmlW; - if (strncmpiW(work, htmlW, len_htmlW) == 0) + work - base.pszSuffix > ARRAY_SIZE(htmlW)) { + work -= ARRAY_SIZE(htmlW); + if (strncmpiW(work, htmlW, ARRAY_SIZE(htmlW)) == 0) manual_search = TRUE; - work += len_htmlW; + work += ARRAY_SIZE(htmlW); } } @@ -1734,11 +1732,11 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) static HRESULT URL_CreateFromPath(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl) { + static const WCHAR file_colonW[] = {'f','i','l','e',':',0}; + static const WCHAR three_slashesW[] = {'/','/','/',0}; DWORD needed; HRESULT ret = S_OK; WCHAR *pszNewUrl; - WCHAR file_colonW[] = {'f','i','l','e',':',0}; - WCHAR three_slashesW[] = {'/','/','/',0}; PARSEDURLW parsed_url; parsed_url.cbSize = sizeof(parsed_url);

1 0

Nikolay Sivov : shlwapi: Forward ThreadRef functions to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 678c18b22ed81d2036c4b458eed29a33bc4c4751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=678c18b22ed81d2036c4b458… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:41:00 2018 +0300 shlwapi: Forward ThreadRef functions to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 1 - dlls/shlwapi/shlwapi.spec | 10 +- dlls/shlwapi/shlwapi_main.c | 3 - dlls/shlwapi/thread.c | 310 -------------------------------------------- 4 files changed, 5 insertions(+), 319 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=678c18b22ed81d2036c4…

1 0

Nikolay Sivov : user32/listbox: Remove duplicated condition.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: db869b61a1a07421a40b65ee825e2cc7130009e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db869b61a1a07421a40b65ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:08 2018 +0300 user32/listbox: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6dbf8d9..6a33f81 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -515,8 +515,8 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { + BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; - BOOL selected = FALSE; if (index < descr->nb_items) { @@ -524,6 +524,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, selected = is_item_selected(descr, index); } + focused = !ignoreFocus && descr->focus_item == index && descr->caret_on && descr->in_focus; + if (IS_OWNERDRAW(descr)) { DRAWITEMSTRUCT dis; @@ -555,9 +557,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemState = 0; if (selected) dis.itemState |= ODS_SELECTED; - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) dis.itemState |= ODS_FOCUS; + if (focused) + dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; @@ -607,9 +608,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText ); } - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) DrawFocusRect( hdc, rect ); + if (focused) + DrawFocusRect( hdc, rect ); } }

1 0

Gabriel Ivăncescu : user32/listbox: Account for NULL item when painting ownerdrawn list.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 8700ef560eb50602af40a418b163f2b3f42e58b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8700ef560eb50602af40a418… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:09 2018 +0300 user32/listbox: Account for NULL item when painting ownerdrawn list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6a33f81..b104bfd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -560,10 +560,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = item ? item->data : 0; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, + descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn );

1 0

Gabriel Ivăncescu : user32/listbox: Store the items array size instead of using HeapSize().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: ae4199e26476d739e0dddb70ce181bbefd1a7c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4199e26476d739e0dddb70… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:10 2018 +0300 user32/listbox: Store the items array size instead of using HeapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b104bfd..594c956 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -67,6 +67,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -713,7 +714,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -727,6 +728,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1537,12 +1539,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1554,6 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1713,13 +1714,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1765,6 +1770,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2506,6 +2512,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1;

1 0

Nikolay Sivov : shlwapi: Forward SHOpenRegStream() to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 9c91ba798659247bdc1807c4a29bc2c61652d4d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c91ba798659247bdc1807c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:57 2018 +0300 shlwapi: Forward SHOpenRegStream() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 107 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 2 insertions(+), 109 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 47e9317..102d6b7 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -369,70 +369,6 @@ static const IStreamVtbl rstvt = IStream_fnClone }; -/* Methods overridden by the dummy stream */ - -/************************************************************************** - * IStream_fnAddRefDummy - */ -static ULONG WINAPI IStream_fnAddRefDummy(IStream *iface) -{ - ISHRegStream *This = impl_from_IStream(iface); - TRACE("(%p)\n", This); - return 2; -} - -/************************************************************************** - * IStream_fnReleaseDummy - */ -static ULONG WINAPI IStream_fnReleaseDummy(IStream *iface) -{ - ISHRegStream *This = impl_from_IStream(iface); - TRACE("(%p)\n", This); - return 1; -} - -/************************************************************************** - * IStream_fnReadDummy - */ -static HRESULT WINAPI IStream_fnReadDummy(IStream *iface, LPVOID pv, ULONG cb, ULONG* pcbRead) -{ - if (pcbRead) - *pcbRead = 0; - return E_NOTIMPL; -} - -static const IStreamVtbl DummyRegStreamVTable = -{ - IStream_fnQueryInterface, - IStream_fnAddRefDummy, /* Overridden */ - IStream_fnReleaseDummy, /* Overridden */ - IStream_fnReadDummy, /* Overridden */ - IStream_fnWrite, - IStream_fnSeek, - IStream_fnSetSize, - IStream_fnCopyTo, - IStream_fnCommit, - IStream_fnRevert, - IStream_fnLockUnlockRegion, - IStream_fnLockUnlockRegion, - IStream_fnStat, - IStream_fnClone -}; - -/* Dummy registry stream object */ -static ISHRegStream rsDummyRegStream = -{ - { &DummyRegStreamVTable }, - 1, - NULL, - NULL, - 0, - 0, - STGM_READWRITE, - {NULL}, - FALSE -}; - /************************************************************************** * IStream_Create * @@ -590,49 +526,6 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, } /************************************************************************* - * SHOpenRegStreamA [SHLWAPI.@] - * - * Create a stream to read binary registry data. - * - * PARAMS - * hKey [I] Registry handle - * pszSubkey [I] The sub key name - * pszValue [I] The value name under the sub key - * dwMode [I] STGM mode for opening the file - * - * RETURNS - * Success: An IStream interface referring to the registry data - * Failure: If the registry key could not be opened or is not binary, - * A dummy (empty) IStream object is returned. - */ -IStream * WINAPI SHOpenRegStreamA(HKEY hkey, LPCSTR pszSubkey, - LPCSTR pszValue, DWORD dwMode) -{ - IStream *iStream; - - TRACE("(%p,%s,%s,0x%08x)\n", hkey, pszSubkey, pszValue, dwMode); - - iStream = SHOpenRegStream2A(hkey, pszSubkey, pszValue, dwMode); - return iStream ? iStream : &rsDummyRegStream.IStream_iface; -} - -/************************************************************************* - * SHOpenRegStreamW [SHLWAPI.@] - * - * See SHOpenRegStreamA. - */ -IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, - LPCWSTR pszValue, DWORD dwMode) -{ - IStream *iStream; - - TRACE("(%p,%s,%s,0x%08x)\n", hkey, debugstr_w(pszSubkey), - debugstr_w(pszValue), dwMode); - iStream = SHOpenRegStream2W(hkey, pszSubkey, pszValue, dwMode); - return iStream ? iStream : &rsDummyRegStream.IStream_iface; -} - -/************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * * Create an IStream object on a block of memory. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index ddc76ec..f9e2570 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -707,8 +707,8 @@ @ stdcall SHIsLowMemoryMachine(long) @ stdcall SHOpenRegStream2A(long str str long) @ stdcall SHOpenRegStream2W(long wstr wstr long) -@ stdcall SHOpenRegStreamA(long str str long) -@ stdcall SHOpenRegStreamW(long wstr wstr long) +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW @ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) @ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr)

1 0

Zebediah Figura : setupapi: Implement SetupDiRemoveDevice().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 24736edfa8b9011da4823a3a7c884b20b40c0535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24736edfa8b9011da4823a3a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:12 2018 -0600 setupapi: Implement SetupDiRemoveDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 63 +++++++++++++++++++++++++++---------------- dlls/setupapi/tests/devinst.c | 6 ----- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4498fdc..5ae3fbd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device GUID class; DEVINST devnode; struct list entry; + BOOL removed; }; struct device_iface @@ -167,6 +168,12 @@ static struct device *get_device(HDEVINFO devinfo, const SP_DEVINFO_DATA *data) return NULL; } + if (device->removed) + { + SetLastError(ERROR_NO_SUCH_DEVINST); + return NULL; + } + return device; } @@ -569,32 +576,36 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } -static void SETUPDI_RemoveDevice(struct device *device) +static void remove_device(struct device *device) +{ + struct device_iface *iface; + + LIST_FOR_EACH_ENTRY(iface, &device->interfaces, struct device_iface, entry) + { + remove_device_iface(iface); + } + + RegDeleteTreeW(device->key, NULL); + RegDeleteKeyW(device->key, emptyW); + RegCloseKey(device->key); + device->key = NULL; + device->removed = TRUE; +} + +static void delete_device(struct device *device) { struct device_iface *iface, *next; - if (device->key != INVALID_HANDLE_VALUE) - RegCloseKey(device->key); if (device->phantom) - { - HKEY enumKey; - LONG l; + remove_device(device); - l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &enumKey, NULL); - if (!l) - { - RegDeleteTreeW(enumKey, device->instanceId); - RegCloseKey(enumKey); - } - } + RegCloseKey(device->key); heap_free(device->instanceId); + LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { list_remove(&iface->entry); - if (device->phantom) - remove_device_iface(iface); RegCloseKey(iface->refstr_key); RegCloseKey(iface->class_key); heap_free(iface->refstr); @@ -635,6 +646,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, list_init(&device->interfaces); device->class = *class; device->devnode = alloc_devnode(device); + device->removed = FALSE; list_add_tail(&set->devices, &device->entry); set->cDevices++; @@ -1538,13 +1550,18 @@ BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ /*********************************************************************** * SetupDiRemoveDevice (SETUPAPI.@) */ -BOOL WINAPI SetupDiRemoveDevice( - HDEVINFO devinfo, - PSP_DEVINFO_DATA info) +BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { - FIXME("(%p, %p): stub\n", devinfo, info); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + remove_device(device); + + return TRUE; } /*********************************************************************** @@ -2616,7 +2633,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) LIST_FOR_EACH_ENTRY_SAFE(device, device2, &set->devices, struct device, entry) { - SETUPDI_RemoveDevice(device); + delete_device(device); } heap_free(set); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 45d145d1..07e082b 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -338,7 +338,6 @@ static void test_device_info(void) check_device_info(set, 3, &guid, NULL); ret = SetupDiRemoveDevice(set, &device); -todo_wine ok(ret, "Got unexpected error %#x.\n", GetLastError()); check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); @@ -349,10 +348,8 @@ todo_wine ok(IsEqualGUID(&ret_device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&ret_device.ClassGuid)); ret = SetupDiGetDeviceInstanceIdA(set, &ret_device, id, sizeof(id), NULL); -todo_wine { ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); -} ok(ret_device.DevInst == device.DevInst, "Expected device node %#x, got %#x.\n", device.DevInst, ret_device.DevInst); @@ -522,7 +519,6 @@ static void test_register_device_info(void) ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); ret = SetupDiRemoveDevice(set, &device); -todo_wine ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); ret = SetupDiEnumDeviceInfo(set, 1, &device); @@ -849,7 +845,6 @@ todo_wine { } ret = SetupDiRemoveDevice(set, &device); -todo_wine ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); @@ -891,7 +886,6 @@ static void test_register_device_iface(void) check_device_iface(set2, NULL, &guid, 1, 0, NULL); ret = SetupDiRemoveDevice(set, &device); -todo_wine ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set);

1 0

Jacek Caban : jscript: Add parser support for getters and setters in object initializer.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 56be97fd5d5fc0a9a5b78005383f6e8770c7fec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56be97fd5d5fc0a9a5b78005… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:32 2018 +0100 jscript: Add parser support for getters and setters in object initializer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.h | 6 ++++++ dlls/jscript/lex.c | 17 ++++++++++++++--- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 29 +++++++++++++++++++++-------- dlls/jscript/tests/lang.js | 2 ++ 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d3fd3d77..d0c419a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -129,6 +129,12 @@ typedef struct { } u; } instr_t; +typedef enum { + PROPERTY_DEFINITION_VALUE, + PROPERTY_DEFINITION_GETTER, + PROPERTY_DEFINITION_SETTER +} property_definition_type_t; + typedef struct { BSTR name; int ref; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 7ef2112..be20e99 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -46,12 +46,14 @@ static const WCHAR falseW[] = {'f','a','l','s','e',0}; static const WCHAR finallyW[] = {'f','i','n','a','l','l','y',0}; static const WCHAR forW[] = {'f','o','r',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; +static const WCHAR getW[] = {'g','e','t',0}; static const WCHAR ifW[] = {'i','f',0}; static const WCHAR inW[] = {'i','n',0}; static const WCHAR instanceofW[] = {'i','n','s','t','a','n','c','e','o','f',0}; static const WCHAR newW[] = {'n','e','w',0}; static const WCHAR nullW[] = {'n','u','l','l',0}; static const WCHAR returnW[] = {'r','e','t','u','r','n',0}; +static const WCHAR setW[] = {'s','e','t',0}; static const WCHAR switchW[] = {'s','w','i','t','c','h',0}; static const WCHAR thisW[] = {'t','h','i','s',0}; static const WCHAR throwW[] = {'t','h','r','o','w',0}; @@ -70,11 +72,12 @@ static const struct { const WCHAR *word; int token; BOOL no_nl; + unsigned min_version; } keywords[] = { - {breakW, kBREAK, TRUE}, + {breakW, kBREAK, TRUE}, {caseW, kCASE}, {catchW, kCATCH}, - {continueW, kCONTINUE, TRUE}, + {continueW, kCONTINUE, TRUE}, {defaultW, kDEFAULT}, {deleteW, kDELETE}, {doW, kDO}, @@ -83,12 +86,14 @@ static const struct { {finallyW, kFINALLY}, {forW, kFOR}, {functionW, kFUNCTION}, + {getW, kGET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {ifW, kIF}, {inW, kIN}, {instanceofW, kINSTANCEOF}, {newW, kNEW}, {nullW, kNULL}, - {returnW, kRETURN, TRUE}, + {returnW, kRETURN, TRUE}, + {setW, kSET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {switchW, kSWITCH}, {thisW, kTHIS}, {throwW, kTHROW}, @@ -169,6 +174,12 @@ static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) r = check_keyword(ctx, keywords[i].word, lval); if(!r) { + if(ctx->script->version < keywords[i].min_version) { + TRACE("ignoring keyword %s in incompatible mode\n", + debugstr_w(keywords[i].word)); + ctx->ptr -= strlenW(keywords[i].word); + return 0; + } ctx->implicit_nl_semicolon = keywords[i].no_nl; return keywords[i].token; } diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 908d6b6..03f504f 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -359,6 +359,7 @@ typedef struct { } array_literal_expression_t; typedef struct _property_definition_t { + unsigned type; literal_t *name; expression_t *value; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 47ac1bc..157bc18 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -45,8 +45,8 @@ typedef struct _property_list_t { property_definition_t *tail; } property_list_t; -static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, - expression_t *value); +static property_definition_t *new_property_definition(parser_ctx_t *ctx, property_definition_type_t, + literal_t *name, expression_t *value); static property_list_t *new_property_list(parser_ctx_t*,property_definition_t*); static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,property_definition_t*); @@ -167,7 +167,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kIN +%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET %token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL @@ -224,6 +224,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <expr> CallExpression %type <expr> MemberExpression %type <expr> PrimaryExpression +%type <expr> GetterSetterMethod %type <identifier> Identifier_opt %type <variable_list> VariableDeclarationList %type <variable_list> VariableDeclarationListNoIn @@ -243,7 +244,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <property_definition> PropertyDefinition %type <literal> PropertyName %type <literal> BooleanLiteral -%type <srcptr> KFunction +%type <srcptr> KFunction left_bracket %type <ival> AssignOper %type <identifier> IdentifierName ReservedAsIdentifier @@ -800,9 +801,17 @@ PropertyNameAndValueList /* ECMA-262 5.1 Edition 12.2.6 */ PropertyDefinition : PropertyName ':' AssignmentExpression - { $$ = new_property_definition(ctx, $1, $3); } + { $$ = new_property_definition(ctx, PROPERTY_DEFINITION_VALUE, $1, $3); } + | kGET PropertyName GetterSetterMethod + { $$ = new_property_definition(ctx, PROPERTY_DEFINITION_GETTER, $2, $3); } + | kSET PropertyName GetterSetterMethod + { $$ = new_property_definition(ctx, PROPERTY_DEFINITION_SETTER, $2, $3); } -/* ECMA-262 3rd Edition 11.1.5 */ +GetterSetterMethod + : left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, NULL, $2, $5, NULL, $1, $6-$1); } + +/* Ecma-262 3rd Edition 11.1.5 */ PropertyName : IdentifierName { $$ = new_string_literal(ctx, $1); } | tStringLiteral { $$ = new_string_literal(ctx, $1); } @@ -839,12 +848,14 @@ ReservedAsIdentifier | kFINALLY { $$ = $1; } | kFOR { $$ = $1; } | kFUNCTION { $$ = $1; } + | kGET { $$ = $1; } | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } + | kSET { $$ = $1; } | kSWITCH { $$ = $1; } | kTHIS { $$ = $1; } | kTHROW { $$ = $1; } @@ -878,7 +889,7 @@ semicolon_opt | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} } left_bracket - : '(' + : '(' { $$ = ctx->ptr; } | error { set_error(ctx, JS_E_MISSING_LBRACKET); YYABORT; } right_bracket @@ -929,10 +940,12 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) return ret; } -static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, expression_t *value) +static property_definition_t *new_property_definition(parser_ctx_t *ctx, property_definition_type_t type, + literal_t *name, expression_t *value) { property_definition_t *ret = parser_alloc(ctx, sizeof(property_definition_t)); + ret->type = type; ret->name = name; ret->value = value; ret->next = NULL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1cd5668..2a30ea3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1832,6 +1832,8 @@ ok(tmp, "tmp = " + tmp); ok(x === undefined, "x = " + x); })(); +var get, set; + /* NoNewline rule parser tests */ while(true) { if(true) break

1 0

Alex Henrie : riched20: Turn several constants and variables into static constants.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 55a3dfe35e2c550edd334ec4be5b27de0bd3b191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a3dfe35e2c550edd334ec4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:17 2018 -0700 riched20: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/paint.c | 4 ++-- dlls/riched20/para.c | 2 +- dlls/riched20/run.c | 2 +- dlls/riched20/table.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 052400c..99c87bf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2520,11 +2520,11 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (editor->styleFlags & ES_MULTILINE) { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; ME_DisplayItem *para = cursor.pPara; int from, to; - const WCHAR endl = '\r'; - const WCHAR endlv10[] = {'\r','\n'}; ME_Style *style, *eop_style; if (editor->styleFlags & ES_READONLY) { diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 44cf3cb..e2ccef4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -989,7 +989,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) } if (me_debug) { - const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; + static const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; WCHAR buf[128]; POINT pt = c->pt; wsprintfW(buf, wszRowDebug, no); @@ -1017,7 +1017,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) c->pt.y + para->pt.y + run->pt.y + baseline, p, para); if (me_debug) { - const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; + static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; WCHAR buf[2560]; POINT pt; pt.x = c->pt.x + run->pt.x; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c4ddb65..7781ff2 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -152,6 +152,7 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) void ME_MakeFirstParagraph(ME_TextEditor *editor) { + static const WCHAR cr_lf[] = {'\r','\n',0}; ME_Context c; CHARFORMAT2W cf; const CHARFORMATW *host_cf; @@ -162,7 +163,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_DisplayItem *run; ME_Style *style; int eol_len; - WCHAR cr_lf[] = {'\r','\n',0}; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 2cdd3d8..66c24f8 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -612,8 +612,8 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) { + static const WCHAR spaceW[] = {' ',0}; SIZE size; - WCHAR spaceW[] = {' ',0}; nLen = min( nLen, run->len ); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 4cd77eb..7e8d7ff 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -56,6 +56,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); +static const WCHAR cr_lf[] = {'\r', '\n', 0}; + static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *eol_str, int eol_len, @@ -77,7 +79,6 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; - WCHAR cr_lf[] = {'\r', '\n', 0}; para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWSTART); return para->member.para.prev_para; } @@ -128,7 +129,6 @@ ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; - WCHAR cr_lf[] = {'\r', '\n', 0}; para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWEND); return para->member.para.prev_para; }

1 0

Alex Henrie : gdi32: Turn variable 'fake_nameW' into a static constant.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 235063d862a1c5489dbabe022e8d55554425a8b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=235063d862a1c5489dbabe02… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:04 2018 -0700 gdi32: Turn variable 'fake_nameW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f50c163..87c55e0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7837,7 +7837,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); if (!full_nameW) { - WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; + static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w(font->name)); full_nameW = strdupW(fake_nameW); }

1 0

Alex Henrie : dwrite: Make constant 'globaldefaultW' static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 195154b747382613dd778778558ea61b53b3c8f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=195154b747382613dd778778… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:03 2018 -0700 dwrite: Make constant 'globaldefaultW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6666249..97b99f9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4263,7 +4263,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection1 hr = IDWriteFontCollection1_FindFamilyName(&collection->IDWriteFontCollection1_iface, emptyW, &index, &exists); if (FAILED(hr) || !exists) { - const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; + static const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; hr = eudc_collection_add_family(factory, collection, emptyW, globaldefaultW); if (hr != S_OK) WARN("failed to add global default EUDC font, 0x%08x\n", hr);

1 0

Serge Gautherie : rpcrt4: Fix 'Routeines' typos.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: c73352047d20a503c67bdd583f6ef8d98711a678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73352047d20a503c67bdd58… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Dec 1 03:17:59 2018 +0100 rpcrt4: Fix 'Routeines' typos. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0dc6789..79c9645 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -519,9 +519,9 @@ @ stub long_from_ndr @ stub long_from_ndr_temp @ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp +@ stub pfnMarshallRoutines # wxp @ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp +@ stub pfnUnmarshallRoutines # wxp @ stub short_array_from_ndr @ stub short_from_ndr @ stub short_from_ndr_temp

1 0

Jacek Caban : jscript: Rename prop_val_t to property_definition_t.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 9193b9f52c5c77951ac6dff581a22f2152570260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9193b9f52c5c77951ac6dff5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:07 2018 +0100 jscript: Rename prop_val_t to property_definition_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/parser.h | 8 ++++---- dlls/jscript/parser.y | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3f9db7a..a498abd 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -888,7 +888,7 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) { - prop_val_t *iter; + property_definition_t *iter; unsigned instr; BSTR name; HRESULT hres; @@ -1999,7 +1999,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) hres = visit_expression(ctx, ((member_expression_t*)expr)->expression); break; case EXPR_PROPVAL: { - prop_val_t *iter; + property_definition_t *iter; for(iter = ((property_value_expression_t*)expr)->property_list; iter; iter = iter->next) { hres = visit_expression(ctx, iter->value); if(FAILED(hres)) diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 65297b9..908d6b6 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -358,16 +358,16 @@ typedef struct { int length; } array_literal_expression_t; -typedef struct _prop_val_t { +typedef struct _property_definition_t { literal_t *name; expression_t *value; - struct _prop_val_t *next; -} prop_val_t; + struct _property_definition_t *next; +} property_definition_t; typedef struct { expression_t expr; - prop_val_t *property_list; + property_definition_t *property_list; } property_value_expression_t; BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0bb8856..5979ef0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -41,8 +41,8 @@ static literal_t *new_string_literal(parser_ctx_t*,const WCHAR*); static literal_t *new_null_literal(parser_ctx_t*); typedef struct _property_list_t { - prop_val_t *head; - prop_val_t *tail; + property_definition_t *head; + property_definition_t *tail; } property_list_t; static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*); @@ -921,9 +921,9 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) return ret; } -static prop_val_t *new_prop_val(parser_ctx_t *ctx, literal_t *name, expression_t *value) +static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, expression_t *value) { - prop_val_t *ret = parser_alloc(ctx, sizeof(prop_val_t)); + property_definition_t *ret = parser_alloc(ctx, sizeof(property_definition_t)); ret->name = name; ret->value = value; @@ -936,14 +936,14 @@ static property_list_t *new_property_list(parser_ctx_t *ctx, literal_t *name, ex { property_list_t *ret = parser_alloc_tmp(ctx, sizeof(property_list_t)); - ret->head = ret->tail = new_prop_val(ctx, name, value); + ret->head = ret->tail = new_property_definition(ctx, name, value); return ret; } static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, literal_t *name, expression_t *value) { - list->tail = list->tail->next = new_prop_val(ctx, name, value); + list->tail = list->tail->next = new_property_definition(ctx, name, value); return list; }

1 0

Zebediah Figura : setupapi: Implement SetupDiRemoveDeviceInterface().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 3ff98740346e69247b572b0a3e9b71c32b0abcf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff98740346e69247b572b0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:10 2018 -0600 setupapi: Implement SetupDiRemoveDeviceInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 28 ++++++++++++++++++++++++---- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b3d7099..cc05623 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -556,6 +556,19 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, return FALSE; } +static void remove_device_iface(struct device_iface *iface) +{ + RegDeleteTreeW(iface->refstr_key, NULL); + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + iface->refstr_key = NULL; + /* Also remove the class key if it's empty. */ + RegDeleteKeyW(iface->class_key, emptyW); + RegCloseKey(iface->class_key); + iface->class_key = NULL; + iface->flags |= SPINT_REMOVED; +} + static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; @@ -1537,11 +1550,18 @@ BOOL WINAPI SetupDiRemoveDevice( /*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ -BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) { - FIXME("(%p, %p): stub\n", info, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + remove_device_iface(iface); + + return TRUE; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 338393e..fbc62dc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -552,7 +552,6 @@ static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, ok_(__FILE__, line)(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ok_(__FILE__, line)(IsEqualGUID(&iface.InterfaceClassGuid, class), "Got unexpected class %s.\n", wine_dbgstr_guid(&iface.InterfaceClassGuid)); -todo_wine_if(flags & SPINT_REMOVED) ok_(__FILE__, line)(iface.Flags == flags, "Got unexpected flags %#x.\n", iface.Flags); ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, detail, sizeof(buffer), NULL, NULL); ok_(__FILE__, line)(ret, "Failed to get interface detail, error %#x.\n", GetLastError()); @@ -656,7 +655,6 @@ static void test_device_iface(void) ret = SetupDiEnumDeviceInterfaces(set, &device, &guid2, 0, &iface); ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); ret = SetupDiRemoveDeviceInterface(set, &iface); -todo_wine ok(ret, "Failed to remove interface, error %#x.\n", GetLastError()); check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}");

1 0

Zebediah Figura : setupapi: Completely remove unregistered device interfaces.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: fa823476c6939114ec52c50b0e3756de7f936aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa823476c6939114ec52c50b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:11 2018 -0600 setupapi: Completely remove unregistered device interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/tests/devinst.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cc05623..4498fdc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -594,7 +594,7 @@ static void SETUPDI_RemoveDevice(struct device *device) { list_remove(&iface->entry); if (device->phantom) - RegDeleteKeyW(iface->refstr_key, emptyW); + remove_device_iface(iface); RegCloseKey(iface->refstr_key); RegCloseKey(iface->class_key); heap_free(iface->refstr); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index fbc62dc..45d145d1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -670,12 +670,6 @@ static void test_device_iface_detail(void) 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; - static const WCHAR devclass[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','D','e','v','i','c','e','C','l','a','s','s','e','s','\\', - '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', - '1','1','d','b','-','b','7','0','4','-', - '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -750,7 +744,6 @@ static void test_device_iface_detail(void) /* remove once Wine is fixed */ devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); } static void test_device_key(void)

1 0

Alex Henrie : dmusic: Make constant 'emulated' static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 6a6660efe2ff46b6f0200a7c622bd95afb6742fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6660efe2ff46b6f0200a7c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:02 2018 -0700 dmusic: Make constant 'emulated' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 033983f..fd450b8 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -373,8 +373,8 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { static void create_system_ports_list(IDirectMusic8Impl* object) { + static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; port_info * port; - const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; ULONG nb_ports; ULONG nb_midi_out; ULONG nb_midi_in;

1 0

Jacek Caban : jscript: Use separated parser rule for property definition.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: fd4c34759f9cb045fd85768e22815017151e4eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd4c34759f9cb045fd85768e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:14 2018 +0100 jscript: Use separated parser rule for property definition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5979ef0..47ac1bc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -45,8 +45,10 @@ typedef struct _property_list_t { property_definition_t *tail; } property_list_t; -static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*); -static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,literal_t*,expression_t*); +static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, + expression_t *value); +static property_list_t *new_property_list(parser_ctx_t*,property_definition_t*); +static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,property_definition_t*); typedef struct _element_list_t { array_element_t *head; @@ -156,6 +158,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state const WCHAR *identifier; struct _parameter_list_t *parameter_list; struct _property_list_t *property_list; + property_definition_t *property_definition; source_elements_t *source_elements; statement_t *statement; struct _statement_list_t *statement_list; @@ -237,6 +240,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <ival> Elision Elision_opt %type <element_list> ElementList %type <property_list> PropertyNameAndValueList +%type <property_definition> PropertyDefinition %type <literal> PropertyName %type <literal> BooleanLiteral %type <srcptr> KFunction @@ -789,10 +793,14 @@ ObjectLiteral /* ECMA-262 3rd Edition 11.1.5 */ PropertyNameAndValueList + : PropertyDefinition { $$ = new_property_list(ctx, $1); } + | PropertyNameAndValueList ',' PropertyDefinition + { $$ = property_list_add(ctx, $1, $3); } + +/* ECMA-262 5.1 Edition 12.2.6 */ +PropertyDefinition : PropertyName ':' AssignmentExpression - { $$ = new_property_list(ctx, $1, $3); } - | PropertyNameAndValueList ',' PropertyName ':' AssignmentExpression - { $$ = property_list_add(ctx, $1, $3, $5); } + { $$ = new_property_definition(ctx, $1, $3); } /* ECMA-262 3rd Edition 11.1.5 */ PropertyName @@ -932,19 +940,16 @@ static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal return ret; } -static property_list_t *new_property_list(parser_ctx_t *ctx, literal_t *name, expression_t *value) +static property_list_t *new_property_list(parser_ctx_t *ctx, property_definition_t *prop) { property_list_t *ret = parser_alloc_tmp(ctx, sizeof(property_list_t)); - - ret->head = ret->tail = new_property_definition(ctx, name, value); - + ret->head = ret->tail = prop; return ret; } -static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, literal_t *name, expression_t *value) +static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, property_definition_t *prop) { - list->tail = list->tail->next = new_property_definition(ctx, name, value); - + list->tail = list->tail->next = prop; return list; }

1 0

Jacek Caban : jscript: Add interpreter support for getters and setters in object initializer.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 0cc68cf82a0414b019a750999c7ca859ad4cea30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc68cf82a0414b019a75099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:40 2018 +0100 jscript: Add interpreter support for getters and setters in object initializer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 9 +++---- dlls/jscript/engine.c | 24 ++++++++++++++++- dlls/jscript/engine.h | 2 +- dlls/mshtml/tests/es5.js | 69 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a498abd..006386a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -889,7 +889,6 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) { property_definition_t *iter; - unsigned instr; BSTR name; HRESULT hres; @@ -905,11 +904,9 @@ static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expres if(FAILED(hres)) return hres; - instr = push_instr(ctx, OP_obj_prop); - if(!instr) - return E_OUTOFMEMORY; - - instr_ptr(ctx, instr)->u.arg->bstr = name; + hres = push_instr_bstr_uint(ctx, OP_obj_prop, name, iter->type); + if(FAILED(hres)) + return hres; } return S_OK; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bd4edda..0f9e3a5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1445,6 +1445,7 @@ static HRESULT interp_new_obj(script_ctx_t *ctx) static HRESULT interp_obj_prop(script_ctx_t *ctx) { const BSTR name = get_op_bstr(ctx, 0); + unsigned type = get_op_uint(ctx, 1); jsdisp_t *obj; jsval_t val; HRESULT hres; @@ -1456,7 +1457,28 @@ static HRESULT interp_obj_prop(script_ctx_t *ctx) assert(is_object_instance(stack_top(ctx))); obj = as_jsdisp(get_object(stack_top(ctx))); - hres = jsdisp_propput_name(obj, name, val); + if(type == PROPERTY_DEFINITION_VALUE) { + hres = jsdisp_propput_name(obj, name, val); + }else { + property_desc_t desc = {PROPF_ENUMERABLE | PROPF_CONFIGURABLE}; + jsdisp_t *func; + + assert(is_object_instance(val)); + func = iface_to_jsdisp(get_object(val)); + + desc.mask = desc.flags; + if(type == PROPERTY_DEFINITION_GETTER) { + desc.explicit_getter = TRUE; + desc.getter = func; + }else { + desc.explicit_setter = TRUE; + desc.setter = func; + } + + hres = jsdisp_define_property(obj, name, &desc); + jsdisp_release(func); + } + jsval_release(val); return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d0c419a..eb287d5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -66,7 +66,7 @@ X(new, 1, ARG_UINT, 0) \ X(new_obj, 1, 0,0) \ X(null, 1, 0,0) \ - X(obj_prop, 1, ARG_BSTR, 0) \ + X(obj_prop, 1, ARG_BSTR, ARG_UINT) \ X(or, 1, 0,0) \ X(pop, 1, ARG_UINT, 0) \ X(pop_except, 0, ARG_ADDR, 0) \ diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6097f4c..3e81961 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -149,7 +149,7 @@ function test_identifier_keywords() { } function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerable, - expected_configurable) { + expected_configurable) { var desc = Object.getOwnPropertyDescriptor(obj, prop); ok("value" in desc, "value is not in desc"); ok(desc.value === obj[prop], "desc.value = " + desc.value + " expected " + obj[prop]); @@ -427,6 +427,72 @@ function test_defineProperty() { next_test(); } +function test_property_definitions() { + var obj, val, i, arr; + + function test_accessor_prop_desc(obj, prop, have_getter, have_setter) { + var desc = Object.getOwnPropertyDescriptor(obj, prop); + ok(desc.enumerable === true, "desc.enumerable = " + desc.enumerable); + ok(desc.configurable === true, "desc.configurable = " + desc.configurable); + + if(have_getter) { + ok(typeof(desc.get) === "function", "desc.get = " + desc.get); + ok(typeof(desc.get.prototype) === "object", "desc.get.prototype = " + desc.get.prototype); + trace("" + desc.get); + }else { + ok(!("get" in obj), "desc.get = " + desc.get); + } + + if(have_setter) { + ok(typeof(desc.set) === "function", "desc.set = " + desc.set); + ok(typeof(desc.set.prototype) === "object", "desc.set.prototype = " + desc.set.prototype); + }else { + ok(!("set" in obj), "desc.get = " + desc.get); + } + } + + obj = { + get prop() { return val + 1; }, + set prop(v) { val = v; } + }; + test_accessor_prop_desc(obj, "prop", true, true); + val = 0; + ok(obj.prop === 1, "obj.prop = " + obj.prop); + obj.prop = 3; + ok(val === 3, "val = " + val); + ok(obj.prop === 4, "obj.prop = " + obj.prop); + + arr = []; + for(i in obj) + arr.push(i); + ok(arr.join() === "prop", "prop of obj = " + arr.join()); + + obj = { + set prop(v) { val = v; } + }; + test_accessor_prop_desc(obj, "prop", false, true); + val = 1; + ok(obj.prop === undefined, "obj.prop = " + obj.prop); + obj.prop = 2; + ok(val === 2, "val = " + val); + ok(obj.prop === undefined, "obj.prop = " + obj.prop); + + obj = { + get prop() { return val + 1; }, + get 0() { return val + 2; } + }; + test_accessor_prop_desc(obj, "prop", true, false); + val = 5; + ok(obj.prop === 6, "obj.prop = " + obj.prop); + obj.prop = 10; + ok(val === 5, "val = " + val); + ok(obj.prop === 6, "obj.prop = " + obj.prop); + test_accessor_prop_desc(obj, "0", true, false); + ok(obj[0] === 7, "obj.prop = " + obj[0]); + + next_test(); +} + function test_string_trim() { function test_trim(value, expected) { var r = String.prototype.trim.call(value); @@ -513,6 +579,7 @@ var tests = [ test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty, + test_property_definitions, test_string_trim, test_global_properties, test_string_split

1 0

Francois Gouget : testbot: Add support for Locale::Codes.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: tools Branch: master Commit: 9d655d133f0bc2335eb84936c569f76b939f7376 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d655d133f0bc2335eb8493… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 3 20:20:01 2018 +0100 testbot: Add support for Locale::Codes. Locale::Country and Locale::Language are deprecated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 78 ++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6783c51..e28a34b 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,8 +33,6 @@ our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); use Fcntl; -use Locale::Language; -use Locale::Country; use WineTestBot::Config; @@ -106,6 +104,68 @@ sub BuildEMailRecipient($$) return $Recipient; } +my $_LCLang; +my $_LocaleLang; +sub GetLanguageName($) +{ + my ($Code) = @_; + local $@; + + return "Konkani" if ($Code eq "kok"); + + if (!defined $_LCLang) + { + eval + { + require Locale::Codes; + $_LCLang = new Locale::Codes 'language'; + $_LCLang->show_errors(0); + }; + if (!$_LCLang) + { + $_LCLang = 0; + $_LocaleLang = eval { require Locale::Language }; + } + } + my $Name = $_LCLang ? ($_LCLang->code2name($Code) || $Code) : + $_LocaleLang ? eval { Locale::Language::code2language($Code) || $Code } : + $Code; + $Name =~ s/ \(.*$//; + return $Name; +} + +my $_LCCountry; +my $_LocaleCountry; +sub GetCountryName($) +{ + my ($Code) = @_; + local $@; + + return "USA" if ($Code eq "US"); + return "Great Britain" if ($Code eq "GB"); + + if (!defined $_LCCountry) + { + eval + { + require Locale::Codes; + $_LCCountry = new Locale::Codes 'country'; + $_LCCountry->show_errors(0); + }; + if (!$_LCCountry) + { + $_LCCountry = 0; + $_LocaleCountry = eval { require Locale::Country }; + } + } + my $Name = $_LCCountry ? ($_LCCountry->code2name($Code) || $Code) : + $_LocaleCountry ? eval { Locale::Country::code2country($Code) || $Code } : + $Code; + $Name =~ s/(?:, | \().*$//; + return $Name; +} + + sub LocaleName($) { my ($Locale) = @_; @@ -114,18 +174,8 @@ sub LocaleName($) if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.[A-Z0-9-]+)?(?:@([a-z]+))?$/) { my ($Lang, $Country, $Modifier) = ($1, $2, $3); - my $Name = $Lang eq "kok" ? "Konkani" : - (code2language($Lang) || $Lang); - $Name =~ s/ \(.*$//; - - if (uc($Lang) ne $Country) - { - my $CountryName = $Country eq "US" ? "USA" : - $Country eq "GB" ? "Great Britain" : - (code2country($Country) || $Country); - $CountryName =~ s/(?:, | \().*$//; - $Name .= ":$CountryName"; - } + my $Name = GetLanguageName($Lang); + $Name .= ":". GetCountryName($Country) if (uc($Lang) ne $Country); $Name .= " ($Modifier)" if ($Modifier); return $Name;

1 0

Francois Gouget : testbot/web: Allow web pages to override the collection headers.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: tools Branch: master Commit: 57690b377b4d2edcb5fc64db947c998c2f2b5dde URL: https://source.winehq.org/git/tools.git/?a=commit;h=57690b377b4d2edcb5fc64d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 3 20:19:46 2018 +0100 testbot/web: Allow web pages to override the collection headers. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 17 +++++++++++++++-- testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm | 7 +++++++ testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 +++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f675e6b..105280e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -238,14 +238,27 @@ sub GenerateHeaderRow($$$) { if ($self->CallDisplayProperty($PropertyDescriptor)) { - print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), - "</th>\n"; + $self->CallGenerateHeaderCell($PropertyDescriptor); } } print "</tr>\n"; } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->GenerateHeaderCell($PropertyDescriptor); +} + +sub GenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + print "<th>", $self->escapeHTML($PropertyDescriptor->GetDisplayName()), + "</th>\n"; +} + sub CallGenerateDataRow($$$$$$) { my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index ff8247e..03a4508 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -45,6 +45,13 @@ sub CallGenerateFormEnd($) $self->{EnclosingPage}->GenerateFormEnd($self); } +sub CallGenerateHeaderCell($$) +{ + my ($self, $PropertyDescriptor) = @_; + + return $self->{EnclosingPage}->GenerateHeaderCell($self, $PropertyDescriptor); +} + sub CallGenerateHeaderRow($$$) { my ($self, $PropertyDescriptors, $Actions) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 194379f..5c48954 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -94,6 +94,13 @@ sub GenerateFormEnd($$) $CollectionBlock->GenerateFormEnd(); } +sub GenerateHeaderCell($$$) +{ + my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + + $CollectionBlock->GenerateHeaderCell($PropertyDescriptor); +} + sub GenerateHeaderRow($$$$) { my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_;

1 0

Francois Gouget : testbot: Add a dir option to specify the directory on Wine missions.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: tools Branch: master Commit: 5faf13cb65f80fa3ed3ad42dae6b8b6ab5d043f9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5faf13cb65f80fa3ed3ad42… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 3 20:19:29 2018 +0100 testbot: Add a dir option to specify the directory on Wine missions. This allows running the tests in a regular directory, in the root of a drive or on a non-c: drive. By default the tests are now run in the root of the wineprefix's c: drive. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 3 ++- testbot/bin/WineRunWineTest.pl | 6 +++--- testbot/bin/build/WineTest.pl | 20 +++++++++++--------- testbot/lib/Build/Utils.pm | 29 +++++++++++++++++++++++------ testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index f61ee65..c903ae3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -47,6 +47,7 @@ use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; use WineTestBot::Missions; +use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -346,7 +347,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". + " ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 19e3e8f..5ce1448 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -439,7 +439,7 @@ $Script .= " ../bin/build/WineTest.pl "; if ($Step->Type eq "suite") { my $BaseTag = BuildTag($VM->Name); - $Script .= "--winetest ". $Task->Missions ." $BaseTag "; + $Script .= "--winetest ". ShQuote($Task->Missions) ." $BaseTag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -455,11 +455,11 @@ if ($Step->Type eq "suite") } elsif ($Step->FileType eq "patch") { - $Script .= "--testpatch ". $Task->Missions ." patch.diff"; + $Script .= "--testpatch ". ShQuote($Task->Missions) ." patch.diff"; } else { - $Script .= join(" ", "--testexe", $Task->Missions, $FileName, $Task->CmdLineArg); + $Script .= join(" ", "--testexe", ShQuote($Task->Missions), $FileName, $Task->CmdLineArg); } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b7389ba..b47a6bf 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -99,9 +99,9 @@ sub DailyWineTest($$$$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); - if (!-f "$BaseName.report") + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -109,8 +109,8 @@ sub DailyWineTest($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -s '../$BaseName.report'")) + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue @@ -168,10 +168,10 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission, "./programs/winetest/winetest.exe.so", - "-c -o '../$BaseName.report' -t do.not.submit ". + RunWine($Mission, "programs/winetest/winetest.exe.so", + "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$BaseName.report") + if (!-f "$DataDir/$BaseName.report") { LogMsg "WineTest did not produce the $BaseName report\n"; return 0; @@ -197,7 +197,9 @@ sub TestExe($$$) } # Run the test executable - RunWine($Mission, "./TestLauncher.exe.so", "-t 120 ". ShArgv2Cmd($FileName, @$Args) ." >'../$BaseName.report'"); + RunWine($Mission, "TestLauncher.exe.so", + "-t 120 ". ShArgv2Cmd($FileName, @$Args) + ." >'$DataDir/$BaseName.report'"); return 1; } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c53f609..b204386 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -348,10 +348,26 @@ sub RunWine($$$) { my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; - my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". - "time $Wine $Cmd $CmdArgs"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + $Cmd = "$WineDir/$Cmd" if ($Cmd =~ /\.exe\.so$/); + + my $CurDir = "$ENV{WINEPREFIX}/dosdevices"; + if (!-d $CurDir) + { + $CurDir = "."; + } + else + { + my $Dir = $Mission->{dir} || ""; + # We cannot put colons in missions so restore the drive letter + $Dir = "$CurDir/c:/$Dir" if ($Dir !~ s~^([a-z])/~$CurDir/$1:/~); + $CurDir = -d $Dir ? $Dir : "$ENV{WINEPREFIX}/dosdevices/c:"; + } + + my $Magic = `file '$Cmd'`; + my $Wine = ($Magic =~ /ELF 64/ ? "$WineDir/wine64" : "$WineDir/wine"); + return system("set -x && cd '$CurDir' && ". + "time '$Wine' '$Cmd' $CmdArgs"); } @@ -367,7 +383,7 @@ sub CreateWinePrefix($;$) rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { return "Failed to disable the crash dialogs: $!"; } @@ -376,7 +392,8 @@ sub CreateWinePrefix($;$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); + my $WineDir = "$DataDir/wine-$Mission->{Build}"; + system("'$WineDir/server/wineserver' -w"); } return undef; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4dd9e25..095de3a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -80,6 +80,7 @@ sub GenerateFooter($) print "On Wine VMs: \n"; print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; + print "The dir option can be set to specify the directory in which to run the tests. A path starting with a single letter followed by a slash specifies the drive, for instance 'c/' for 'c:' (the default). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n";

1 0

Józef Kucia : vkd3d: Add FIXME() for unsupported strip cut values.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: vkd3d Branch: master Commit: a1ad45be69aa4be6525f120f79264ddd3000caff URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1ad45be69aa4be6525f120… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:30 2018 +0100 vkd3d: Add FIXME() for unsupported strip cut values. In Vulkan, the strip cut value is derived from the current index buffer format. We could recompile the pipeline to handle more cases. 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> --- libs/vkd3d/command.c | 18 ++++++++++++++++++ libs/vkd3d/state.c | 6 ++---- libs/vkd3d/vkd3d_private.h | 4 +++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d5e898..2e6357a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1703,6 +1703,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->strides, 0, sizeof(list->strides)); list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + list->index_buffer_format = DXGI_FORMAT_UNKNOWN; + memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; list->fb_height = 0; @@ -2293,6 +2295,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap return; } + switch (list->state->u.graphics.index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); + break; + default: + break; + } + VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); } @@ -3475,6 +3491,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics return; } + list->index_buffer_format = view->Format; + resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, view->BufferLocation); VK_CALL(vkCmdBindIndexBuffer(list->vk_command_buffer, resource->u.vk_buffer, view->BufferLocation - resource->gpu_address, index_type)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 03d8ef3..64c2158 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2236,11 +2236,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s switch (desc->IBStripCutValue) { case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED: - graphics->primitive_restart_enable = VK_FALSE; - break; case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - graphics->primitive_restart_enable = VK_TRUE; + graphics->index_buffer_strip_cut_value = desc->IBStripCutValue; break; default: WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue); @@ -2506,7 +2504,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.pNext = NULL; ia_desc.flags = 0; ia_desc.topology = topology; - ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable; + ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f977559..7e04dc3 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -531,7 +531,7 @@ struct d3d12_graphics_pipeline_state size_t attachment_count, rt_idx; VkRenderPass render_pass; - VkBool32 primitive_restart_enable; + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc; @@ -696,6 +696,8 @@ struct d3d12_command_list uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; VkPrimitiveTopology primitive_topology; + DXGI_FORMAT index_buffer_format; + VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; unsigned int fb_height;

1 0

Józef Kucia : vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: vkd3d Branch: master Commit: 6851bc6667cda7f9506f21705b747bb3a0e7fb17 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6851bc6667cda7f9506f217… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:31 2018 +0100 vkd3d: Implement D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED. 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> --- libs/vkd3d/command.c | 59 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2e6357a..937c7e3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2251,6 +2251,34 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return true; } +static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_command_list *list) +{ + struct d3d12_graphics_pipeline_state *graphics = &list->state->u.graphics; + + /* In Vulkan, the strip cut value is derived from the index buffer format. */ + switch (graphics->index_buffer_strip_cut_value) + { + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) + { + FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: + if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) + { + FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + list->index_buffer_format); + } + break; + + default: + break; + } +} + static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCommandList *iface, UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) @@ -2287,27 +2315,15 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap iface, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location); - vk_procs = &list->device->vk_procs; - if (!d3d12_command_list_begin_render_pass(list)) { WARN("Failed to begin render pass, ignoring draw call.\n"); return; } - switch (list->state->u.graphics.index_buffer_strip_cut_value) - { - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: - if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); - break; - default: - break; - } + vk_procs = &list->device->vk_procs; + + d3d12_command_list_check_index_buffer_strip_cut_value(list); VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); @@ -4113,6 +4129,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC arg_buffer_offset, max_command_count, signature_desc->ByteStride)); break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + if (!d3d12_command_list_begin_render_pass(list)) + { + WARN("Failed to begin render pass, ignoring draw.\n"); + break; + } + + d3d12_command_list_check_index_buffer_strip_cut_value(list); + + VK_CALL(vkCmdDrawIndexedIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, + arg_buffer_offset, max_command_count, signature_desc->ByteStride)); + break; + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: if (max_command_count != 1) FIXME("Ignoring command count %u.\n", max_command_count);

1 0

Józef Kucia : tests: Add test for primitive restart.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: vkd3d Branch: master Commit: c74074d93f258e057da80f99234d0e8fded22791 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c74074d93f258e057da80f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:29 2018 +0100 tests: Add test for primitive restart. 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> --- tests/d3d12.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 173 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e9dbbaa..7ad0303 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21914,6 +21914,177 @@ static void test_multisample_rendering(void) destroy_test_context(&context); } +static void test_primitive_restart(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + ID3D12CommandQueue *queue; + unsigned int index_count; + ID3D12Resource *ib, *vb; + size_t buffer_size; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + void *ptr; + + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const struct + { + int8_t x, y; + } + quad[] = + { + {-1, -1}, + {-1, 1}, + { 1, -1}, + { 1, 1}, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"position", 0, DXGI_FORMAT_R8G8_SINT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const uint16_t indices16[] = {0, 1, 2, 3}; + static const uint32_t indices[] = {0, 1, 2, 3}; + static const uint16_t indices16_max[] = {0, 1, 2, 0xffff}; + static const uint32_t indices_max16[] = {0, 1, 2, 0xffff}; + static const uint16_t indices16_restart[] = {0, 1, 2, 0xffff, 2, 1, 3}; + static const uint32_t indices_restart[] = {0, 1, 2, 0xffffffff, 2, 1, 3}; + static const struct + { + D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; + DXGI_FORMAT ib_format; + const void *indices; + size_t indices_size; + unsigned int last_index; + bool full_quad; + bool is_todo; + } + tests[] = + { + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, false}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R16_UINT, indices16_restart, sizeof(indices16_restart), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, false, true}, + + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF, DXGI_FORMAT_R32_UINT, indices_restart, sizeof(indices_restart), 0x0003, true}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + buffer_size = (tests[i].last_index + 1) * sizeof(*quad); + + vb = create_upload_buffer(context.device, buffer_size, NULL); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = buffer_size; + + pso_desc.IBStripCutValue = tests[i].strip_cut_value; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + ibv.Format = tests[i].ib_format; + ib = create_upload_buffer(context.device, tests[i].indices_size, tests[i].indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = tests[i].indices_size; + index_count = tests[i].indices_size / format_size(ibv.Format); + + hr = ID3D12Resource_Map(vb, 0, NULL, &ptr); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy(ptr, quad, (ARRAY_SIZE(quad) - 1) * sizeof(*quad)); + memcpy((BYTE *)ptr + tests[i].last_index * sizeof(*quad), &quad[ARRAY_SIZE(quad) - 1], sizeof(*quad)); + ID3D12Resource_Unmap(vb, 0, NULL); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, index_count, 1, 0, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + if (tests[i].full_quad) + { + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + } + else + { + set_box(&box, 16, 0, 0, 32, 10, 1); + todo_if(tests[i].is_todo) + check_readback_data_uint(&rb, &box, 0xffffffff, 0); + set_box(&box, 0, 16, 0, 16, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + } + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Resource_Release(ib); + ID3D12Resource_Release(vb); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + } + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -22047,4 +22218,5 @@ START_TEST(d3d12) run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); run_test(test_multisample_rendering); + run_test(test_primitive_restart); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index fc07af7..c2e7a3d 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -203,6 +203,7 @@ static unsigned int format_size(DXGI_FORMAT format) return 4; case DXGI_FORMAT_R16_FLOAT: case DXGI_FORMAT_R16_UNORM: + case DXGI_FORMAT_R16_UINT: return 2; case DXGI_FORMAT_BC1_UNORM: case DXGI_FORMAT_BC1_UNORM_SRGB:

1 0

Józef Kucia : tests: Print adapter info on Windows.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: vkd3d Branch: master Commit: b4d2306b9ba726a678b2d08c3585f56da3cdb0b3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b4d2306b9ba726a678b2d08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 11:31:26 2018 +0100 tests: Print adapter info on Windows. 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> --- include/vkd3d_dxgi.idl | 26 +++++++++++++++++++++++++- tests/d3d12.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f..7e07a78 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,19 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC +{ + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -80,6 +92,18 @@ interface IDXGIDeviceSubObject : IDXGIObject } [ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + +[ local, object, uuid(310d36a0-d2e7-4c0a-aa04-6a9d23b8886a), diff --git a/tests/d3d12.c b/tests/d3d12.c index e5a6249..3956fba 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,18 +890,41 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); return adapter; } + +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} #else static IUnknown *create_adapter(void) { return NULL; } + +static void print_adapter_info(void) {} #endif static ID3D12Device *create_device(void) @@ -21923,6 +21946,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support);

1 0