June 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader().
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: b45db52d983e2a78bd7dc2eee555c86f128ffb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45db52d983e2a78bd7dc2eee… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:06 2017 +0300 d3dx9/tests: Remove a leftover todo_wine_if in test_effect_preshader(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 86ea0dd..4315dd1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4399,7 +4399,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ARRAY_SIZE(test_effect_preshader_bconsts)); ok(hr == D3D_OK, "Got result %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) - todo_wine_if(!bdata[i] != !test_effect_preshader_bconsts[i]) ok(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match.\n"); for (; i < 16; ++i)

1 0

Paul Gofman : d3dx9/tests: Extend test for boolean matrix constant setting.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 7178c167423241e7ccbaf3b3f1c0d41aae2b5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7178c167423241e7ccbaf3b3f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:07 2017 +0300 d3dx9/tests: Extend test for boolean matrix constant setting. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 1010 ++++++++++++++++++++++-------------------- 1 file changed, 520 insertions(+), 490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7178c167423241e7ccbaf…

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 2a3ad1d2098a2b0e462a362e4f689de11868da90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3ad1d2098a2b0e462a362e4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:08 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bcb526e..ad9c553 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4305,6 +4305,19 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) +{ + BOOL bval = FALSE; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 16; ++i) + { + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4368,12 +4381,9 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetPixelShaderConstantF(device, i, &fvect_filler.x, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } - bval = FALSE; - for (i = 0; i < 16; ++i) - { - hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - } + + test_effect_preshader_clear_pbool_consts(device); + for (i = 0; i < 16; ++i) { hr = IDirect3DDevice9_SetPixelShaderConstantI(device, i, ivect_empty, 1);

1 0

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: eea701cca0e305745036c26c57f44f40e29178dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eea701cca0e305745036c26c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:09 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_compare_pbool_consts() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 79 ++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ad9c553..eaf1647 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4254,7 +4254,7 @@ static const D3DXVECTOR4 test_effect_preshader_fvect_v[] = {91.0f, 0.0f, 0.0f, 0.0f}, {4.0f, 5.0f, 6.0f, 7.0f}, }; -#define TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) +#define TEST_EFFECT_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) #define test_effect_preshader_compare_vconsts(a, b, c) \ test_effect_preshader_compare_vconsts_(__LINE__, a, b, c) @@ -4278,8 +4278,8 @@ static void test_effect_preshader_compare_vconsts_(unsigned int line, IDirect3DD { for (i = 0; i < ARRAY_SIZE(test_effect_preshader_fvect_v); ++i) { - if (const_updated_mask[i / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE] - & (1u << (i % TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE))) + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { ok_(__FILE__, line)(!memcmp(&fdata[i], &test_effect_preshader_fvect_v[i], sizeof(fdata[i])), "Vertex shader float constants do not match, expected (%g, %g, %g, %g), \ @@ -4305,6 +4305,11 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static const BOOL test_effect_preshader_bconsts[] = +{ + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE +}; + static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) { BOOL bval = FALSE; @@ -4318,6 +4323,52 @@ static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) } } +#define test_effect_preshader_compare_pbool_consts(a, b, c) \ + test_effect_preshader_compare_pbool_consts_(__LINE__, a, b, c) +static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDirect3DDevice9 *device, + const unsigned int *const_updated_mask, const char *updated_param) +{ + unsigned int i; + BOOL bdata[16]; + HRESULT hr; + + hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, ARRAY_SIZE(bdata)); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + if (!const_updated_mask) + { + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) + { + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u.\n", + test_effect_preshader_bconsts[i], bdata[i], i); + } + } + else + { + for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) + { + if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] + & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) + { + ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], + "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u, parameter %s.\n", + test_effect_preshader_bconsts[i], bdata[i], i, updated_param); + } + else + { + ok_(__FILE__, line)(!bdata[i], + "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); + } + } + } + + for (; i < 16; ++i) + { + ok_(__FILE__, line)(!bdata[i], "Got result %#x, boolean register value %u.\n", hr, bdata[i]); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4337,10 +4388,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) {11.0f, 21.0f, 31.0f, 0.0f}, {12.0f, 22.0f, 32.0f, 0.0f} }; - static const BOOL test_effect_preshader_bconsts[] = - { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE - }; static const int test_effect_preshader_iconsts[][4] = { {4, 3, 2, 1} @@ -4353,10 +4400,8 @@ static void test_effect_preshader(IDirect3DDevice9 *device) D3DXHANDLE par; unsigned int npasses; DWORD value; - BOOL bval; D3DXVECTOR4 fdata[ARRAY_SIZE(test_effect_preshader_fvect_p)]; int idata[ARRAY_SIZE(test_effect_preshader_iconsts)][4]; - BOOL bdata[ARRAY_SIZE(test_effect_preshader_bconsts)]; IDirect3DVertexShader9 *vshader; unsigned int i; D3DCAPS9 caps; @@ -4435,17 +4480,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) "Pixel shader integer constants do not match.\n"); } - hr = IDirect3DDevice9_GetPixelShaderConstantB(device, 0, bdata, - ARRAY_SIZE(test_effect_preshader_bconsts)); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) - ok(!bdata[i] == !test_effect_preshader_bconsts[i], - "Pixel shader boolean constants do not match.\n"); - for (; i < 16; ++i) - { - hr = IDirect3DDevice9_GetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK && !bval, "Got result %#x, boolean register value %u.\n", hr, bval); - } + test_effect_preshader_compare_pbool_consts(device, NULL, NULL); test_effect_preshader_op_results(device, NULL, NULL); @@ -5075,7 +5110,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) { const char *param_name; const unsigned int const_updated_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) - + TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE]; + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; } check_vconsts_parameters[] = { @@ -5093,7 +5128,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) {"ts3", {0x00000fc0, 0x00000000}}, }; static const unsigned int const_no_update_mask[(ARRAY_SIZE(test_effect_preshader_fvect_v) - + TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_FVECT_BITMASK_BLOCK_SIZE]; + + TEST_EFFECT_BITMASK_BLOCK_SIZE - 1) / TEST_EFFECT_BITMASK_BLOCK_SIZE]; static const D3DLIGHT9 light_filler = {D3DLIGHT_POINT}; ID3DXEffect *effect;

1 0

Hugh McMaster : regedit: Only show the 'Modify' menu items when the listview has focus.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: adf298685f97e3d8faaee2f7440d5d417d360da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf298685f97e3d8faaee2f74… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:14 2017 +0000 regedit: Only show the 'Modify' menu items when the listview has focus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 164 ++++++++++++++++++++++---------------------- po/bg.po | 162 +++++++++++++++++++++---------------------- po/ca.po | 164 ++++++++++++++++++++++---------------------- po/cs.po | 164 ++++++++++++++++++++++---------------------- po/da.po | 164 ++++++++++++++++++++++---------------------- po/de.po | 164 ++++++++++++++++++++++---------------------- po/el.po | 162 +++++++++++++++++++++---------------------- po/en.po | 164 ++++++++++++++++++++++---------------------- po/en_US.po | 164 ++++++++++++++++++++++---------------------- po/eo.po | 164 ++++++++++++++++++++++---------------------- po/es.po | 164 ++++++++++++++++++++++---------------------- po/fa.po | 162 +++++++++++++++++++++---------------------- po/fi.po | 164 ++++++++++++++++++++++---------------------- po/fr.po | 164 ++++++++++++++++++++++---------------------- po/he.po | 164 ++++++++++++++++++++++---------------------- po/hi.po | 162 +++++++++++++++++++++---------------------- po/hr.po | 162 +++++++++++++++++++++---------------------- po/hu.po | 164 ++++++++++++++++++++++---------------------- po/it.po | 164 ++++++++++++++++++++++---------------------- po/ja.po | 164 ++++++++++++++++++++++---------------------- po/ko.po | 164 ++++++++++++++++++++++---------------------- po/lt.po | 164 ++++++++++++++++++++++---------------------- po/ml.po | 162 +++++++++++++++++++++---------------------- po/nb_NO.po | 164 ++++++++++++++++++++++---------------------- po/nl.po | 164 ++++++++++++++++++++++---------------------- po/or.po | 162 +++++++++++++++++++++---------------------- po/pa.po | 162 +++++++++++++++++++++---------------------- po/pl.po | 164 ++++++++++++++++++++++---------------------- po/pt_BR.po | 164 ++++++++++++++++++++++---------------------- po/pt_PT.po | 164 ++++++++++++++++++++++---------------------- po/rm.po | 162 +++++++++++++++++++++---------------------- po/ro.po | 164 ++++++++++++++++++++++---------------------- po/ru.po | 164 ++++++++++++++++++++++---------------------- po/sk.po | 162 +++++++++++++++++++++---------------------- po/sl.po | 164 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 162 +++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 162 +++++++++++++++++++++---------------------- po/sv.po | 164 ++++++++++++++++++++++---------------------- po/te.po | 162 +++++++++++++++++++++---------------------- po/th.po | 162 +++++++++++++++++++++---------------------- po/tr.po | 164 ++++++++++++++++++++++---------------------- po/uk.po | 164 ++++++++++++++++++++++---------------------- po/wa.po | 162 +++++++++++++++++++++---------------------- po/wine.pot | 162 +++++++++++++++++++++---------------------- po/zh_CN.po | 164 ++++++++++++++++++++++---------------------- po/zh_TW.po | 164 ++++++++++++++++++++++---------------------- programs/regedit/framewnd.c | 22 +++++- programs/regedit/regedit.rc | 6 +- programs/regedit/resource.h | 2 + 49 files changed, 3810 insertions(+), 3732 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf298685f97e3d8faaee…

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu items.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: f0949baafc4c63ab5796eff0e9c4fe30d1659d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0949baafc4c63ab5796eff0e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:24 2017 +0000 regedit: Update handling of the 'Modify' menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d3dffdc..9853810 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -137,10 +137,11 @@ static void update_modify_items(HMENU hMenu, int index) { unsigned int state = MF_ENABLED; - if (!g_pChildWnd->nFocusPanel || index == -1) + if (index == -1) state = MF_GRAYED; EnableMenuItem(hMenu, ID_EDIT_MODIFY, state | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_MODIFY_BIN, state | MF_BYCOMMAND); } static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName, int index)

1 0

Piotr Caban : include: Add __EXCEPT_CTX/__FINALLY_CTX macros.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 3eae4807dcee36341eeaf0a89a1ded7b51a0c4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eae4807dcee36341eeaf0a89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 12:39:29 2017 +0200 include: Add __EXCEPT_CTX/__FINALLY_CTX macros. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 38 ++++++++++++++++++++++++++++++++++++++ include/wine/exception.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index c81c821..0e00f73 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -99,6 +99,31 @@ DWORD __wine_exception_handler( EXCEPTION_RECORD *record, unwind_frame( record, frame ); } +DWORD __wine_exception_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + EXCEPTION_POINTERS ptrs; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter_ctx( &ptrs, wine_frame->ctx )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + } + unwind_frame( record, frame ); +} + DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, @@ -133,3 +158,16 @@ DWORD __wine_finally_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + wine_frame->u.finally_func_ctx( FALSE, wine_frame->ctx ); + } + return ExceptionContinueSearch; +} diff --git a/include/wine/exception.h b/include/wine/exception.h index f275568..5bc4d1c 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -81,7 +81,9 @@ extern "C" { #define __TRY __try #define __EXCEPT(func) __except((func)(GetExceptionInformation())) +#define __EXCEPT_CTX(func, ctx) __except((func)(GetExceptionInformation(), ctx)) #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } +#define __FINALLY_CTX(func, ctx) __finally { (func)(!AbnormalTermination(), ctx); } #define __ENDTRY /*nothing*/ #define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) #define __EXCEPT_ALL __except(EXCEPTION_EXECUTE_HANDLER) @@ -100,6 +102,10 @@ extern DWORD __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; +extern DWORD __wine_exception_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; extern DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, @@ -112,6 +118,10 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; +extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; #define __TRY \ do { __WINE_FRAME __f; \ @@ -131,6 +141,18 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { +#define __EXCEPT_CTX(func, context) \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_ctx_handler; \ + __f.u.filter_ctx = (func); \ + __f.ctx = context; \ + if (sigsetjmp( __f.jmp, 0 )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + /* convenience handler for page fault exceptions */ #define __EXCEPT_PAGE_FAULT \ } while(0); \ @@ -175,9 +197,25 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, } \ } while (0); +#define __FINALLY_CTX(func, context) \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + (func)(1, context); \ + break; \ + } else { \ + __f.frame.Handler = __wine_finally_ctx_handler; \ + __f.u.finally_func_ctx = (func); \ + __f.ctx = context; \ + __wine_push_frame( &__f.frame ); \ + __first = 0; \ + } \ + } while (0); + typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); +typedef LONG (CALLBACK *__WINE_FILTER_CTX)(PEXCEPTION_POINTERS, void*); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); +typedef void (CALLBACK *__WINE_FINALLY_CTX)(BOOL, void*); #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) @@ -190,9 +228,12 @@ typedef struct __tagWINE_FRAME { /* exception data */ __WINE_FILTER filter; + __WINE_FILTER_CTX filter_ctx; /* finally data */ __WINE_FINALLY finally_func; + __WINE_FINALLY_CTX finally_func_ctx; } u; + void *ctx; sigjmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode;

1 0

Daniel Lehman : msvcrt: Translate SEH exception on each call to __CxxFrameHandler.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 4aa813867cbd6ead4e1a66cdd0b5c8f3b6372fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa813867cbd6ead4e1a66cdd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 19 10:16:07 2017 -0700 msvcrt: Translate SEH exception on each call to __CxxFrameHandler. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 46 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index e891567..57fce93 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -108,6 +108,14 @@ typedef struct __cxx_function_descr UINT flags; } cxx_function_descr; +typedef struct +{ + ULONG64 dest_frame; + ULONG64 orig_frame; + DISPATCHER_CONTEXT *dispatch; + const cxx_function_descr *descr; +} se_translator_ctx; + static inline void* rva_to_ptr(UINT rva, ULONG64 base) { return rva ? (void*)(base+rva) : NULL; @@ -429,6 +437,26 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("no matching catch block found\n"); } +static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) +{ + se_translator_ctx *ctx = (se_translator_ctx *)c; + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + cxx_exception_type *exc_type; + + if (rec->ExceptionCode != CXX_EXCEPTION) + { + TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode); + MSVCRT_terminate(); + } + + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + find_catch_block(rec, ctx->dest_frame, ctx->dispatch, + ctx->descr, exc_type, ctx->orig_frame); + + __DestructExceptionObject(rec); + return ExceptionContinueSearch; +} + static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) @@ -554,10 +582,22 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (data->se_translator) { EXCEPTION_POINTERS except_ptrs; + se_translator_ctx ctx; - except_ptrs.ExceptionRecord = rec; - except_ptrs.ContextRecord = context; - data->se_translator(rec->ExceptionCode, &except_ptrs); + ctx.dest_frame = frame; + ctx.orig_frame = orig_frame; + ctx.dispatch = dispatch; + ctx.descr = descr; + __TRY + { + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } + __EXCEPT_CTX(se_translation_filter, &ctx) + { + } + __ENDTRY } }

1 0

Owen Rudge : wsdapi/tests: Add WSDCreateUdpAddress tests.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 30b356337384ca38b00c4273d278a73054233bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b356337384ca38b00c4273d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:37 2017 +0100 wsdapi/tests: Add WSDCreateUdpAddress tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 1 + dlls/wsdapi/tests/address.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 77434cf..a4a2821 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 user32 C_SRCS = \ + address.c \ discovery.c \ memory.c \ xml.c diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c new file mode 100644 index 0000000..8b16b06 --- /dev/null +++ b/dlls/wsdapi/tests/address.c @@ -0,0 +1,82 @@ +/* + * Web Services on Devices + * Address tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateUdpAddress_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL, *udpAddress2 = NULL; + IWSDTransportAddress *transportAddress = NULL; + IWSDAddress *address = NULL; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateUdpAddress(NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08x\n", rc); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUDPAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* Try to query for objects */ + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDUdpAddress, (LPVOID*)&udpAddress2); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDUdpAddress_Release(udpAddress2); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDTransportAddress, (LPVOID*)&transportAddress); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDTransportAddress_Release(transportAddress); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDAddress, (LPVOID*)&address); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDAddress_Release(address); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + ref = IWSDUdpAddress_Release(udpAddress); + ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); +} + +START_TEST(address) +{ + CoInitialize(NULL); + + CreateUdpAddress_tests(); + + CoUninitialize(); +}

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetTransportAddress.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: a4ee1b2675074b795054c6174b27a3ae11c2c42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee1b2675074b795054c6174… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:40 2017 +0100 wsdapi/tests: Add tests for Get/SetTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/address.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index a4a2821..e2f6642 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 +IMPORTS = wsdapi ole32 user32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 8b16b06..c1bf3ba 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <winsock2.h> #include <windows.h> #include "wine/test.h" @@ -72,11 +73,71 @@ static void CreateUdpAddress_tests(void) ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); } +static void GetSetTransportAddress_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + const WCHAR ipv4Address[] = {'1','0','.','2','0','.','3','0','.','4','0',0}; + const WCHAR ipv6Address[] = {'a','a','b','b',':','c','d',':',':','a','b','c',0}; + const WCHAR invalidAddress[] = {'n','o','t','/','v','a','l','i','d',0}; + LPCWSTR returnedAddress = NULL; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); + + /* Try setting a null address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + /* Try setting an invalid address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, invalidAddress); + todo_wine ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + + /* Try setting an IPv4 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Try setting an IPv6 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); + GetSetTransportAddress_udp_tests(); CoUninitialize(); }

1 0