- Wine-Commits - list.winehq.org

Nikolay Sivov : winhttp/tests: Add some more tests for string options in WinHttpQueryOption().
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: wine Branch: master Commit: 4a2265742a07609f1d53bccfd46d60cc6f09b07f URL: https://gitlab.winehq.org/wine/wine/-/commit/4a2265742a07609f1d53bccfd46d60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 16 12:54:24 2024 +0200 winhttp/tests: Add some more tests for string options in WinHttpQueryOption(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a1f8c15e356..6e814247167 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3332,6 +3332,15 @@ static void test_redirect(int port) ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + /* Exact buffer size match. */ + url[0] = 0; + size = (lstrlenW(expected) + 1) * sizeof(WCHAR); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); + todo_wine + ok(ret, "got %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %lu\n", GetLastError()); @@ -4417,6 +4426,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + size = (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR); + buffer[0] = 0; + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); + todo_wine + ok(ret, "failed to query proxy username %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); @@ -4463,6 +4483,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + size = (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR); + buffer[0] = 0; + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); + todo_wine + ok(ret, "failed to query proxy password %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); @@ -4485,6 +4516,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + size = (lstrlenW(userW) + 1) * sizeof(WCHAR); + buffer[0] = 0; + ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); + todo_wine + ok(ret, "failed to query username %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); @@ -4507,6 +4549,17 @@ static void test_credentials(void) ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + /* Exact buffer size match. */ + buffer[0] = 0; + size = (lstrlenW(passW) + 1) * sizeof(WCHAR); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); + todo_wine + ok(ret, "failed to query password %lu\n", GetLastError()); + todo_wine + ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + todo_wine + ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); + buffer[0] = 0x1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size);

1 0

Jacek Caban : mshtml: Directly use dispex_prop_put and dispex_prop_get in HTMLElement implementation.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: wine Branch: master Commit: 2261b2653a67f0220694f896d3f0f4465f6b40c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2261b2653a67f0220694f896d3f0f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 15 19:08:41 2024 +0200 mshtml: Directly use dispex_prop_put and dispex_prop_get in HTMLElement implementation. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlelem.c | 13 +++---------- dlls/mshtml/mshtml_private.h | 4 ++++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 72eb8db40a7..ccba451507b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1914,7 +1914,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IWineJSDispatchHost *iface, BSTR bstr return S_OK; } -static HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller) +HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller) { switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: { @@ -1950,7 +1950,7 @@ static HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT } } -static HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller) +HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller) { static DISPID propput_dispid = DISPID_PROPERTYPUT; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 470b718523b..750bc8f2428 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1161,8 +1161,6 @@ static inline WCHAR *translate_attr_name(WCHAR *attr_name, compat_mode_t compat_ static HRESULT set_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *v) { - DISPID propput_dispid = DISPID_PROPERTYPUT; - DISPPARAMS dp = {v, &propput_dispid, 1, 1}; EXCEPINFO ei; if(dispid == DISPID_IHTMLELEMENT_STYLE) { @@ -1170,8 +1168,7 @@ static HRESULT set_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, V return S_OK; } - return IWineJSDispatchHost_InvokeEx(&elem->node.event_target.dispex.IWineJSDispatchHost_iface, dispid, - LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + return dispex_prop_put(&elem->node.event_target.dispex, dispid, LOCALE_SYSTEM_DEFAULT, v, &ei, NULL); } static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, @@ -1238,11 +1235,8 @@ done: HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) { - DISPPARAMS dispParams = {NULL, NULL, 0, 0}; EXCEPINFO excep; - - return IWineJSDispatchHost_InvokeEx(&elem->node.event_target.dispex.IWineJSDispatchHost_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); + return dispex_prop_get(&elem->node.event_target.dispex, dispid, LOCALE_SYSTEM_DEFAULT, ret, &excep, NULL); } HRESULT attr_value_to_string(VARIANT *v) @@ -2483,8 +2477,7 @@ static HRESULT WINAPI HTMLElement_toString(IHTMLElement *iface, BSTR *String) if(!String) return E_INVALIDARG; - hres = IWineJSDispatchHost_InvokeEx(&This->node.event_target.dispex.IWineJSDispatchHost_iface, DISPID_VALUE, - LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, NULL, &var, NULL, NULL); + hres = dispex_prop_get(&This->node.event_target.dispex, DISPID_VALUE, LOCALE_SYSTEM_DEFAULT, &var, NULL, NULL); if(SUCCEEDED(hres)) { assert(V_VT(&var) == VT_BSTR); *String = V_BSTR(&var); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0bce00762b7..dffb191f13c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -508,6 +508,10 @@ compat_mode_t dispex_compat_mode(DispatchEx*); HRESULT dispex_to_string(DispatchEx*,BSTR*); HRESULT dispex_call_builtin(DispatchEx *dispex, DISPID id, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller); +HRESULT dispex_prop_get(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, + IServiceProvider *caller); +HRESULT dispex_prop_put(DispatchEx *dispex, DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, + IServiceProvider *caller); typedef enum { DISPEXPROP_CUSTOM,

1 0

Nikolay Sivov : winhttp: Handle exact buffer length match in WinHttpQueryOption().
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: wine Branch: master Commit: 9e9b59908ef9a06c7aeecd4298761b1b45446c04 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9b59908ef9a06c7aeecd4298761b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 16 13:07:28 2024 +0200 winhttp: Handle exact buffer length match in WinHttpQueryOption(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winhttp/session.c | 2 +- dlls/winhttp/tests/winhttp.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d579d72583e..e8e286145ca 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -685,7 +685,7 @@ static BOOL return_string_option( WCHAR *buffer, const WCHAR *str, LPDWORD bufle { int len = sizeof(WCHAR); if (str) len += lstrlenW( str ) * sizeof(WCHAR); - if (buffer && *buflen > len) + if (buffer && *buflen >= len) { if (str) memcpy( buffer, str, len ); len -= sizeof(WCHAR); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6e814247167..2e086222aba 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3336,9 +3336,7 @@ static void test_redirect(int port) url[0] = 0; size = (lstrlenW(expected) + 1) * sizeof(WCHAR); ret = WinHttpQueryOption(req, WINHTTP_OPTION_URL, url, &size); - todo_wine ok(ret, "got %lu\n", GetLastError()); - todo_wine ok(!wcscmp(url, expected), "expected %s got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(url)); ret = WinHttpReceiveResponse(req, NULL); @@ -4430,11 +4428,8 @@ static void test_credentials(void) size = (lstrlenW(proxy_userW) + 1) * sizeof(WCHAR); buffer[0] = 0; ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - todo_wine ok(ret, "failed to query proxy username %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1; @@ -4487,11 +4482,8 @@ static void test_credentials(void) size = (lstrlenW(proxy_passW) + 1) * sizeof(WCHAR); buffer[0] = 0; ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - todo_wine ok(ret, "failed to query proxy password %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1; @@ -4520,11 +4512,8 @@ static void test_credentials(void) size = (lstrlenW(userW) + 1) * sizeof(WCHAR); buffer[0] = 0; ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - todo_wine ok(ret, "failed to query username %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1; @@ -4553,11 +4542,8 @@ static void test_credentials(void) buffer[0] = 0; size = (lstrlenW(passW) + 1) * sizeof(WCHAR); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - todo_wine ok(ret, "failed to query password %lu\n", GetLastError()); - todo_wine ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - todo_wine ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); buffer[0] = 0x1;

1 0

Alexandre Julliard : ntdll: Implement KiUserEmulationDispatcher on ARM64EC.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: wine Branch: master Commit: 3bd8af0eb6a6d665ef6b3feb4dafe0d26e602aa1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bd8af0eb6a6d665ef6b3feb4dafe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 16 12:25:37 2024 +0200 ntdll: Implement KiUserEmulationDispatcher on ARM64EC. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm64ec.c | 18 ++++++++++++++++++ dlls/ntdll/unix/loader.c | 3 +++ dlls/ntdll/unix/signal_arm64.c | 13 ++++++++++++- dlls/ntdll/unix/unix_private.h | 8 ++++++++ 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 78afe2f49f5..85aa48eacb5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -71,6 +71,7 @@ @ stdcall -norelay KiUserApcDispatcher(ptr long long long ptr) @ stdcall -norelay KiUserCallbackDispatcher(long ptr long) @ stdcall -norelay -arch=arm,arm64,arm64ec KiUserCallbackDispatcherReturn() +@ stdcall -norelay -arch=arm64ec KiUserEmulationDispatcher(ptr) @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) # @ stub LdrAccessOutOfProcessResource @ stdcall LdrAccessResource(long ptr ptr ptr) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 20eb5ff662e..e44ac9fc467 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -44,6 +44,7 @@ static void (WINAPI *pBTCpu64FlushInstructionCache)(const void*,SIZE_T); static BOOLEAN (WINAPI *pBTCpu64IsProcessorFeaturePresent)(UINT); static void (WINAPI *pBTCpu64NotifyMemoryDirty)(void*,SIZE_T); static void (WINAPI *pBTCpu64NotifyReadFile)(HANDLE,void*,SIZE_T,BOOL,NTSTATUS); +static void (WINAPI *pBeginSimulation)(void); static void (WINAPI *pFlushInstructionCacheHeavy)(const void*,SIZE_T); static NTSTATUS (WINAPI *pNotifyMapViewOfSection)(void*,void*,void*,SIZE_T,ULONG,ULONG); static void (WINAPI *pNotifyMemoryAlloc)(void*,SIZE_T,ULONG,ULONG,BOOL,NTSTATUS); @@ -157,6 +158,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) GET_PTR( BTCpu64IsProcessorFeaturePresent ); GET_PTR( BTCpu64NotifyMemoryDirty ); GET_PTR( BTCpu64NotifyReadFile ); + GET_PTR( BeginSimulation ); GET_PTR( FlushInstructionCacheHeavy ); GET_PTR( NotifyMapViewOfSection ); GET_PTR( NotifyMemoryAlloc ); @@ -1030,6 +1032,22 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) } +/******************************************************************* + * KiUserEmulationDispatcher (NTDLL.@) + */ +void dispatch_emulation( ARM64_NT_CONTEXT *arm_ctx ) +{ + context_arm_to_x64( get_arm64ec_cpu_area()->ContextAmd64, arm_ctx ); + pBeginSimulation(); +} +__ASM_GLOBAL_FUNC( "#KiUserEmulationDispatcher", + ".seh_context\n\t" + ".seh_endprologue\n\t" + "mov x0, sp\n\t" /* context */ + "bl dispatch_emulation\n\t" + "brk #1" ) + + /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 19fbfb2b68c..1267469bf37 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -111,6 +111,7 @@ void *pKiRaiseUserExceptionDispatcher = NULL; void *pKiUserExceptionDispatcher = NULL; void *pKiUserApcDispatcher = NULL; void *pKiUserCallbackDispatcher = NULL; +void *pKiUserEmulationDispatcher = NULL; void *pLdrInitializeThunk = NULL; void *pRtlUserThreadStart = NULL; void *p__wine_ctrl_routine = NULL; @@ -1576,6 +1577,7 @@ static void load_ntdll_functions( HMODULE module ) if (is_arm64ec()) { GET_FUNC( __wine_unix_call_dispatcher_arm64ec ); + GET_FUNC( KiUserEmulationDispatcher ); } *p__wine_syscall_dispatcher = __wine_syscall_dispatcher; *p__wine_unixlib_handle = (UINT_PTR)unix_call_funcs; @@ -1669,6 +1671,7 @@ static void redirect_ntdll_functions( HMODULE module ) REDIRECT( KiUserExceptionDispatcher ); REDIRECT( KiUserApcDispatcher ); REDIRECT( KiUserCallbackDispatcher ); + REDIRECT( KiUserEmulationDispatcher ); REDIRECT( LdrInitializeThunk ); REDIRECT( RtlUserThreadStart ); #undef REDIRECT diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 667bc1108cf..b54fa30a318 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -320,10 +320,21 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) */ NTSTATUS signal_set_full_context( CONTEXT *context ) { + struct syscall_frame *frame = arm64_thread_data()->syscall_frame; NTSTATUS status = NtSetContextThread( GetCurrentThread(), context ); if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) - arm64_thread_data()->syscall_frame->restore_flags |= CONTEXT_INTEGER; + frame->restore_flags |= CONTEXT_INTEGER; + + if (is_arm64ec() && !is_ec_code( frame->pc )) + { + CONTEXT *user_context = (CONTEXT *)((frame->sp - sizeof(CONTEXT)) & ~15); + + user_context->ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), user_context ); + frame->sp = (ULONG_PTR)user_context; + frame->pc = (ULONG_PTR)pKiUserEmulationDispatcher; + } return status; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6cd88a5acc0..91267f66e76 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -147,6 +147,7 @@ extern void *pKiRaiseUserExceptionDispatcher; extern void *pKiUserExceptionDispatcher; extern void *pKiUserApcDispatcher; extern void *pKiUserCallbackDispatcher; +extern void *pKiUserEmulationDispatcher; extern void *pLdrInitializeThunk; extern void *pRtlUserThreadStart; extern void *p__wine_ctrl_routine; @@ -415,6 +416,13 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +static inline BOOL is_ec_code( ULONG_PTR ptr ) +{ + const UINT64 *map = (const UINT64 *)peb->EcCodeBitMap; + ULONG_PTR page = ptr / page_size; + return (map[page / 64] >> (page & 63)) & 1; +} + static inline void mutex_lock( pthread_mutex_t *mutex ) { if (!process_exiting) pthread_mutex_lock( mutex );

1 0

Shaun Ren : vkd3d-shader/d3dbc: Implement HLSL_OP1_{COS,SIN}_REDUCED for SM1.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: vkd3d Branch: master Commit: 0202393d41f00d8c9f20f59ec080b833b5436f5a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0202393d41f00d8c9f20f59ec080b… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue Jul 9 16:33:47 2024 -0400 vkd3d-shader/d3dbc: Implement HLSL_OP1_{COS,SIN}_REDUCED for SM1. Also enable SM1 trigonometry function tests. --- libs/vkd3d-shader/d3dbc.c | 16 ++++++++++++++++ libs/vkd3d-shader/hlsl.h | 4 ++-- tests/hlsl/trigonometry.shader_test | 16 ++++++++-------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index e4b501c6..492ad9b6 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2371,6 +2371,17 @@ static void d3dbc_write_per_component_unary_op(struct d3dbc_compiler *d3dbc, } } +static void d3dbc_write_sincos(struct d3dbc_compiler *d3dbc, enum hlsl_ir_expr_op op, + const struct hlsl_reg *dst, const struct hlsl_reg *src) +{ + if (op == HLSL_OP1_COS_REDUCED) + assert(dst->writemask == VKD3DSP_WRITEMASK_0); + else /* HLSL_OP1_SIN_REDUCED */ + assert(dst->writemask == VKD3DSP_WRITEMASK_1); + + d3dbc_write_unary_op(d3dbc, D3DSIO_SINCOS, dst, src, 0, 0); +} + static void d3dbc_write_expr(struct d3dbc_compiler *d3dbc, const struct hlsl_ir_node *instr) { const struct vkd3d_shader_version *version = &d3dbc->program->shader_version; @@ -2439,6 +2450,11 @@ static void d3dbc_write_expr(struct d3dbc_compiler *d3dbc, const struct hlsl_ir_ d3dbc_write_per_component_unary_op(d3dbc, instr, D3DSIO_RSQ); break; + case HLSL_OP1_COS_REDUCED: + case HLSL_OP1_SIN_REDUCED: + d3dbc_write_sincos(d3dbc, expr->op, &instr->reg, &arg1->reg); + break; + case HLSL_OP2_ADD: d3dbc_write_binary_op(d3dbc, D3DSIO_ADD, &instr->reg, &arg1->reg, &arg2->reg); break; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index cd6cf91e..d08dd4f2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -645,7 +645,7 @@ enum hlsl_ir_expr_op HLSL_OP1_CAST, HLSL_OP1_CEIL, HLSL_OP1_COS, - HLSL_OP1_COS_REDUCED, /* Reduced range [-pi, pi] */ + HLSL_OP1_COS_REDUCED, /* Reduced range [-pi, pi], writes to .x */ HLSL_OP1_DSX, HLSL_OP1_DSX_COARSE, HLSL_OP1_DSX_FINE, @@ -666,7 +666,7 @@ enum hlsl_ir_expr_op HLSL_OP1_SAT, HLSL_OP1_SIGN, HLSL_OP1_SIN, - HLSL_OP1_SIN_REDUCED, /* Reduced range [-pi, pi] */ + HLSL_OP1_SIN_REDUCED, /* Reduced range [-pi, pi], writes to .y */ HLSL_OP1_SQRT, HLSL_OP1_TRUNC, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 0b3e4c1a..86161e3d 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -5,7 +5,7 @@ void main(float4 pos : position, out float tex : texcoord, out float4 out_pos : out_pos = pos; } -[pixel shader todo(sm<4)] +[pixel shader] float4 main(float tex : texcoord) : sv_target { tex = floor(tex + 0.25); @@ -13,7 +13,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.00000000, 0.0) probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 1.55740772, 0.0) 1024 probe ( 2, 0) rgba ( 0.90929743, -0.41614684, -2.18503986, 0.0) 1024 @@ -32,7 +32,7 @@ probe (14, 0) rgba ( 0.99060736, 0.13673722, 7.24460662, 0.0) 1024 probe (15, 0) rgba ( 0.65028784, -0.75968791, -0.85599340, 0.0) 1024 -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -42,11 +42,11 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe (0, 0) rgba (0.0, 500.0, 500.0, 0.0) -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -56,11 +56,11 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe (0, 0) rgba (1000.0, 707.0, -0.0, -707.0) -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -72,7 +72,7 @@ float4 main() : sv_target % tan(pi/2) is an asymtote and therefore undefined % so check 0, pi/4, 3pi/4, pi uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe (0, 0) rgba (0, 1000, -1000.0, 0)

1 0

Shaun Ren : vkd3d-shader/hlsl: Implement sin/cos for SM1.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: vkd3d Branch: master Commit: b4845b9dcaa0a1075a9d0e400009b1f810170d20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4845b9dcaa0a1075a9d0e400009b… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 10 22:47:51 2024 -0400 vkd3d-shader/hlsl: Implement sin/cos for SM1. Also introduce HLSL_OP3_MAD. --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 104 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index acf50869..1526d7b0 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2849,6 +2849,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP3_CMP] = "cmp", [HLSL_OP3_DP2ADD] = "dp2add", [HLSL_OP3_TERNARY] = "ternary", + [HLSL_OP3_MAD] = "mad", }; return op_names[op]; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0f78f0b5..cd6cf91e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -699,6 +699,7 @@ enum hlsl_ir_expr_op * CMP(a, b, c) returns 'b' if 'a' >= 0, and 'c' otherwise. It's used only for SM1-SM3 targets. */ HLSL_OP3_CMP, HLSL_OP3_TERNARY, + HLSL_OP3_MAD, }; #define HLSL_MAX_OPERANDS 3 diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 02884df9..c96a70b4 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -20,6 +20,7 @@ #include "hlsl.h" #include <stdio.h> +#include <math.h> /* TODO: remove when no longer needed, only used for new_offset_instr_from_deref() */ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -3016,6 +3017,108 @@ static bool lower_floor(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct return true; } +/* Lower SIN/COS to SINCOS for SM1. */ +static bool lower_trig(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_node *arg, *half, *two_pi, *reciprocal_two_pi, *neg_pi; + struct hlsl_constant_value half_value, two_pi_value, reciprocal_two_pi_value, neg_pi_value; + struct hlsl_ir_node *mad, *frc, *reduced; + struct hlsl_type *type; + struct hlsl_ir_expr *expr; + enum hlsl_ir_expr_op op; + struct hlsl_ir_node *sincos; + int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (expr->op == HLSL_OP1_SIN) + op = HLSL_OP1_SIN_REDUCED; + else if (expr->op == HLSL_OP1_COS) + op = HLSL_OP1_COS_REDUCED; + else + return false; + + arg = expr->operands[0].node; + type = arg->data_type; + + /* Reduce the range of the input angles to [-pi, pi]. */ + for (i = 0; i < type->dimx; ++i) + { + half_value.u[i].f = 0.5; + two_pi_value.u[i].f = 2.0 * M_PI; + reciprocal_two_pi_value.u[i].f = 1.0 / (2.0 * M_PI); + neg_pi_value.u[i].f = -M_PI; + } + + if (!(half = hlsl_new_constant(ctx, type, &half_value, &instr->loc)) + || !(two_pi = hlsl_new_constant(ctx, type, &two_pi_value, &instr->loc)) + || !(reciprocal_two_pi = hlsl_new_constant(ctx, type, &reciprocal_two_pi_value, &instr->loc)) + || !(neg_pi = hlsl_new_constant(ctx, type, &neg_pi_value, &instr->loc))) + return false; + hlsl_block_add_instr(block, half); + hlsl_block_add_instr(block, two_pi); + hlsl_block_add_instr(block, reciprocal_two_pi); + hlsl_block_add_instr(block, neg_pi); + + if (!(mad = hlsl_new_ternary_expr(ctx, HLSL_OP3_MAD, arg, reciprocal_two_pi, half))) + return false; + hlsl_block_add_instr(block, mad); + if (!(frc = hlsl_new_unary_expr(ctx, HLSL_OP1_FRACT, mad, &instr->loc))) + return false; + hlsl_block_add_instr(block, frc); + if (!(reduced = hlsl_new_ternary_expr(ctx, HLSL_OP3_MAD, frc, two_pi, neg_pi))) + return false; + hlsl_block_add_instr(block, reduced); + + if (type->dimx == 1) + { + if (!(sincos = hlsl_new_unary_expr(ctx, op, reduced, &instr->loc))) + return false; + hlsl_block_add_instr(block, sincos); + } + else + { + struct hlsl_ir_node *comps[4] = {0}; + struct hlsl_ir_var *var; + struct hlsl_deref var_deref; + struct hlsl_ir_load *var_load; + + for (i = 0; i < type->dimx; ++i) + { + uint32_t s = hlsl_swizzle_from_writemask(1 << i); + + if (!(comps[i] = hlsl_new_swizzle(ctx, s, 1, reduced, &instr->loc))) + return false; + hlsl_block_add_instr(block, comps[i]); + } + + if (!(var = hlsl_new_synthetic_var(ctx, "sincos", type, &instr->loc))) + return false; + hlsl_init_simple_deref_from_var(&var_deref, var); + + for (i = 0; i < type->dimx; ++i) + { + struct hlsl_block store_block; + + if (!(sincos = hlsl_new_unary_expr(ctx, op, comps[i], &instr->loc))) + return false; + hlsl_block_add_instr(block, sincos); + + if (!hlsl_new_store_component(ctx, &store_block, &var_deref, i, sincos)) + return false; + hlsl_block_add_block(block, &store_block); + } + + if (!(var_load = hlsl_new_load_index(ctx, &var_deref, NULL, &instr->loc))) + return false; + hlsl_block_add_instr(block, &var_load->node); + } + + return true; +} + static bool lower_logic_not(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS]; @@ -6050,6 +6153,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_round, body); lower_ir(ctx, lower_ceil, body); lower_ir(ctx, lower_floor, body); + lower_ir(ctx, lower_trig, body); lower_ir(ctx, lower_comparison_operators, body); lower_ir(ctx, lower_logic_not, body); if (ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL)

1 0

Shaun Ren : vkd3d-shader/d3dbc: Implement HLSL_OP3_MAD for SM1.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: vkd3d Branch: master Commit: 8724cbe5d56004db001d46e41759905a83a33c75 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8724cbe5d56004db001d46e417599… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Jul 10 22:51:05 2024 -0400 vkd3d-shader/d3dbc: Implement HLSL_OP3_MAD for SM1. --- libs/vkd3d-shader/d3dbc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index abfbd461..e4b501c6 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2499,6 +2499,10 @@ static void d3dbc_write_expr(struct d3dbc_compiler *d3dbc, const struct hlsl_ir_ d3dbc_write_dp2add(d3dbc, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); break; + case HLSL_OP3_MAD: + d3dbc_write_ternary_op(d3dbc, D3DSIO_MAD, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); + break; + default: hlsl_fixme(ctx, &instr->loc, "SM1 \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break;

1 0

Shaun Ren : vkd3d-shader/hlsl: Allocate registers for HLSL_OP1_{COS,SIN}_REDUCED with the required writemasks.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: vkd3d Branch: master Commit: ea2ffc0b6c040e7da564f64f1224f47126a26893 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea2ffc0b6c040e7da564f64f1224f… Author: Shaun Ren <sren(a)codeweavers.com> Date: Thu Jun 20 19:11:44 2024 -0400 vkd3d-shader/hlsl: Allocate registers for HLSL_OP1_{COS,SIN}_REDUCED with the required writemasks. --- libs/vkd3d-shader/hlsl_codegen.c | 70 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c96a70b4..26386c0b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4333,6 +4333,30 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct register_a return ret; } +/* Allocate a register with writemask, while reserving reg_writemask. */ +static struct hlsl_reg allocate_register_with_masks(struct hlsl_ctx *ctx, struct register_allocator *allocator, + unsigned int first_write, unsigned int last_read, uint32_t reg_writemask, uint32_t writemask) +{ + struct hlsl_reg ret = {0}; + uint32_t reg_idx; + + assert((reg_writemask & writemask) == writemask); + + for (reg_idx = 0;; ++reg_idx) + { + if ((get_available_writemask(allocator, first_write, last_read, reg_idx) & reg_writemask) == reg_writemask) + break; + } + + record_allocation(ctx, allocator, reg_idx, reg_writemask, first_write, last_read); + + ret.id = reg_idx; + ret.allocation_size = 1; + ret.writemask = writemask; + ret.allocated = true; + return ret; +} + static bool is_range_available(const struct register_allocator *allocator, unsigned int first_write, unsigned int last_read, uint32_t reg_idx, unsigned int reg_size) { @@ -4536,6 +4560,44 @@ static void calculate_resource_register_counts(struct hlsl_ctx *ctx) } } +static void allocate_instr_temp_register(struct hlsl_ctx *ctx, + struct hlsl_ir_node *instr, struct register_allocator *allocator) +{ + unsigned int reg_writemask = 0, dst_writemask = 0; + + if (instr->reg.allocated || !instr->last_read) + return; + + if (instr->type == HLSL_IR_EXPR) + { + switch (hlsl_ir_expr(instr)->op) + { + case HLSL_OP1_COS_REDUCED: + dst_writemask = VKD3DSP_WRITEMASK_0; + reg_writemask = ctx->profile->major_version < 3 ? (1 << 3) - 1 : VKD3DSP_WRITEMASK_0; + break; + + case HLSL_OP1_SIN_REDUCED: + dst_writemask = VKD3DSP_WRITEMASK_1; + reg_writemask = ctx->profile->major_version < 3 ? (1 << 3) - 1 : VKD3DSP_WRITEMASK_1; + break; + + default: + break; + } + } + + if (reg_writemask) + instr->reg = allocate_register_with_masks(ctx, allocator, + instr->index, instr->last_read, reg_writemask, dst_writemask); + else + instr->reg = allocate_numeric_registers_for_type(ctx, allocator, + instr->index, instr->last_read, instr->data_type); + + TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index, + debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read); +} + static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct register_allocator *allocator) { @@ -4575,13 +4637,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, if (ctx->profile->major_version >= 4 && instr->type == HLSL_IR_CONSTANT) continue; - if (!instr->reg.allocated && instr->last_read) - { - instr->reg = allocate_numeric_registers_for_type(ctx, allocator, instr->index, instr->last_read, - instr->data_type); - TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index, - debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read); - } + allocate_instr_temp_register(ctx, instr, allocator); switch (instr->type) {

1 0

Shaun Ren : vkd3d-shader/ir: Lower SM1 SINCOS to SM4 SINCOS.
by Alexandre Julliard July 16, 2024

July 16, 2024

Module: vkd3d Branch: master Commit: b3a11a9ec4879ee151bcbcd35a9b3f5a1914c454 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3a11a9ec4879ee151bcbcd35a9b3… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue Jul 9 18:29:29 2024 -0400 vkd3d-shader/ir: Lower SM1 SINCOS to SM4 SINCOS. --- libs/vkd3d-shader/ir.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index be9e4219..9202c77c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -377,6 +377,58 @@ static enum vkd3d_result vsir_program_lower_precise_mad(struct vsir_program *pro return VKD3D_OK; } +static enum vkd3d_result vsir_program_lower_sm1_sincos(struct vsir_program *program, + struct vkd3d_shader_instruction *sincos) +{ + struct vkd3d_shader_instruction_array *instructions = &program->instructions; + size_t pos = sincos - instructions->elements; + struct vkd3d_shader_instruction *ins; + unsigned int s; + + if (sincos->dst_count != 1) + return VKD3D_OK; + + if (!shader_instruction_array_insert_at(instructions, pos + 1, 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + ins = &instructions->elements[pos + 1]; + + if (!(vsir_instruction_init_with_params(program, ins, &sincos->location, VKD3DSIH_SINCOS, 2, 1))) + return VKD3D_ERROR_OUT_OF_MEMORY; + + ins->flags = sincos->flags; + + *ins->src = *sincos->src; + /* Set the source swizzle to replicate the first component. */ + s = vsir_swizzle_get_component(sincos->src->swizzle, 0); + ins->src->swizzle = vkd3d_shader_create_swizzle(s, s, s, s); + + if (sincos->dst->write_mask & VKD3DSP_WRITEMASK_1) + { + ins->dst[0] = *sincos->dst; + ins->dst[0].write_mask = VKD3DSP_WRITEMASK_1; + } + else + { + vsir_dst_param_init(&ins->dst[0], VKD3DSPR_NULL, VKD3D_DATA_UNUSED, 0); + } + + if (sincos->dst->write_mask & VKD3DSP_WRITEMASK_0) + { + ins->dst[1] = *sincos->dst; + ins->dst[1].write_mask = VKD3DSP_WRITEMASK_0; + } + else + { + vsir_dst_param_init(&ins->dst[1], VKD3DSPR_NULL, VKD3D_DATA_UNUSED, 0); + } + + /* Make the original instruction no-op */ + vkd3d_shader_instruction_make_nop(sincos); + + return VKD3D_OK; +} + static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *program, struct vkd3d_shader_message_context *message_context) { @@ -410,6 +462,11 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr vkd3d_shader_instruction_make_nop(ins); break; + case VKD3DSIH_SINCOS: + if ((ret = vsir_program_lower_sm1_sincos(program, ins)) < 0) + return ret; + break; + default: break; }

1 0

Eric Pouech : winedump: Dump comment streams in minidump.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 49fbd6dac8781c8abd2ff5feb685ce2f88555edd URL: https://gitlab.winehq.org/wine/wine/-/commit/49fbd6dac8781c8abd2ff5feb685ce… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 7 15:21:32 2024 +0200 winedump: Dump comment streams in minidump. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index fddfd0e45fe..d8010ea0159 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -854,6 +854,36 @@ void mdmp_dump(void) } } break; + case CommentStreamA: + { + /* MSDN states an ANSI string, so stopping at first '\0' if any */ + const char *end = memchr(stream, '\0', dir->Location.DataSize); + printf("Stream [%u]: CommentA\n", idx); + printf("--- start of comment\n"); + write(1, stream, end ? end - (const char*)stream : dir->Location.DataSize); + printf("--- end of comment\n"); + if (globals_dump_sect("content")) + dump_mdmp_data(&dir->Location, " "); + } + break; + case CommentStreamW: + { + const WCHAR *ptr; + + /* MSDN states an UNICODE string, so stopping at first L'\0' if any */ + printf("Stream [%u]: CommentW\n", idx); + printf("--- start of comment\n"); + for (ptr = stream; ptr + 1 <= (const WCHAR *)((const char *)stream + dir->Location.DataSize) && *ptr; ptr++) + { + if (*ptr== L'\n' || *ptr== L'\r' || *ptr== L'\t' || (*ptr >= L' ' && *ptr < 127)) + putchar((char)*ptr); + else printf("\\u%04x", *ptr); + } + printf("--- end of comment\n"); + if (globals_dump_sect("content")) + dump_mdmp_data(&dir->Location, " "); + } + break; default: printf("Stream [%u]: NIY %d\n", idx, dir->StreamType); printf(" RVA: %#x\n", (UINT)dir->Location.Rva);

1 0