May 2019 - Wine-Commits - list.winehq.org

Paul Gofman : wined3d: Implement point lights in process_vertices_strided( ).
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: wine Branch: master Commit: 1381ca7c5a447d122570d80e145f3518e04f64a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381ca7c5a447d122570d80e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:36 2019 +0430 wined3d: Implement point lights in process_vertices_strided(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 22b43c4..5c9ccba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6356,6 +6356,39 @@ static void test_specular_lighting(void) {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, {{0.0f}, {0.0f}, {0.0f}}, {{0.0f}, {0.0f}, {1.0f}}, + }, + point = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 100.0f, + 0.0f, + 0.0f, 0.0f, 1.0f, + }, + point_side = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{-1.1f}, {0.0f}, {1.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 100.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, + }, + point_far = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 1.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, }; static const struct expected_color { @@ -6374,6 +6407,30 @@ static void test_specular_lighting(void) {320, 360, 0x00717171}, {480, 360, 0x003c3c3c}, }, + expected_point_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00090909}, + {480, 120, 0x00000000}, + {160, 240, 0x00090909}, + {320, 240, 0x00fafafa}, + {480, 240, 0x00090909}, + {160, 360, 0x00000000}, + {320, 360, 0x00090909}, + {480, 360, 0x00000000}, + }, + expected_point_far[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00000000}, + {480, 120, 0x00000000}, + {160, 240, 0x00000000}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00000000}, + {160, 360, 0x00000000}, + {320, 360, 0x00000000}, + {480, 360, 0x00000000}, + }, expected_zero[] = { {160, 120, 0x00000000}, @@ -6396,7 +6453,12 @@ static void test_specular_lighting(void) tests[] = { {&directional, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, + {&point, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&point_side, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point_far, 1.0f, expected_point_far, ARRAY_SIZE(expected_point_far)}, {&directional, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point_far, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; D3DMATRIXHANDLE world_handle, view_handle, proj_handle; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 23aca23..f5b9caa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3292,6 +3292,10 @@ static void init_transformed_lights(struct lights_settings *ls, ++ls->directional_light_count; break; + case WINED3D_LIGHT_POINT: + ++ls->point_light_count; + break; + default: FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type); continue; @@ -3319,6 +3323,26 @@ static void init_transformed_lights(struct lights_settings *ls, light->specular = light_info->OriginalParms.specular; ++index; } + + for (i = 0; i < light_count; ++i) + { + light_info = lights[i]; + if (light_info->OriginalParms.type != WINED3D_LIGHT_POINT) + continue; + + light = &ls->lights[index]; + + wined3d_vec4_transform(&light->position, &light_info->position, &state->transforms[WINED3D_TS_VIEW]); + light->range = light_info->OriginalParms.range; + light->c_att = light_info->OriginalParms.attenuation0; + light->l_att = light_info->OriginalParms.attenuation1; + light->q_att = light_info->OriginalParms.attenuation2; + + light->diffuse = light_info->OriginalParms.diffuse; + light->ambient = light_info->OriginalParms.ambient; + light->specular = light_info->OriginalParms.specular; + ++index; + } } static void update_light_diffuse_specular(struct wined3d_color *diffuse, struct wined3d_color *specular, @@ -3353,7 +3377,9 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d struct wined3d_vec3 normal_transformed = {0.0f}; struct wined3d_vec4 position_transformed; const struct light_transformed *light; + struct wined3d_vec3 dir, dst; unsigned int i, index; + float att; wined3d_vec4_transform(&position_transformed, position, &ls->modelview_matrix); position_transformed_normalised = *(const struct wined3d_vec3 *)&position_transformed; @@ -3381,6 +3407,41 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d update_light_diffuse_specular(diffuse, specular, &light->direction, 1.0f, material_shininess, &normal_transformed, &position_transformed_normalised, light, ls); } + + for (i = 0; i < ls->point_light_count; ++i, ++index) + { + light = &ls->lights[index]; + dir.x = light->position.x - position_transformed.x; + dir.y = light->position.y - position_transformed.y; + dir.z = light->position.z - position_transformed.z; + + dst.z = wined3d_vec3_dot(&dir, &dir); + dst.y = sqrtf(dst.z); + dst.x = 1.0f; + if (ls->legacy_lighting) + { + dst.y = (light->range - dst.y) / light->range; + if (!(dst.y > 0.0f)) + continue; + dst.z = dst.y * dst.y; + } + else + { + if (!(dst.y <= light->range)) + continue; + } + att = dst.x * light->c_att + dst.y * light->l_att + dst.z * light->q_att; + if (!ls->legacy_lighting) + att = 1.0f / att; + + wined3d_color_rgb_mul_add(ambient, &light->ambient, att); + if (normal) + { + wined3d_vec3_normalise(&dir); + update_light_diffuse_specular(diffuse, specular, &dir, att, material_shininess, + &normal_transformed, &position_transformed_normalised, light, ls); + } + } } /* Context activation is done by the caller. */

1 0

Alexandre Julliard : rundll.exe: Build with msvcrt.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: wine Branch: master Commit: 2e45ce1326bc9cffb140755b0503ff2a00cc887f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e45ce1326bc9cffb140755b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 17:54:15 2019 +0200 rundll.exe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll.exe16/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in index 4ea0fe9..4abce90 100644 --- a/programs/rundll.exe16/Makefile.in +++ b/programs/rundll.exe16/Makefile.in @@ -1,4 +1,5 @@ MODULE = rundll.exe16 -APPMODE = -mconsole -m16 + +EXTRADLLFLAGS = -mconsole -m16 -mno-cygwin C_SRCS = rundll.c

1 0

Alexandre Julliard : msvcrt: Add the static object files to all the msvcrt import libraries.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: wine Branch: master Commit: ec2e282b5b2798520240c6e01ca15413e36ad775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2e282b5b2798520240c6e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 11:11:01 2019 +0200 msvcrt: Add the static object files to all the msvcrt import libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47238 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 2 ++ dlls/msvcr110/Makefile.in | 2 ++ dlls/msvcr120/Makefile.in | 2 ++ dlls/msvcr70/Makefile.in | 2 ++ dlls/msvcr71/Makefile.in | 2 ++ dlls/msvcr80/Makefile.in | 2 ++ dlls/msvcr90/Makefile.in | 2 ++ dlls/msvcrtd/Makefile.in | 2 ++ 8 files changed, 16 insertions(+) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 07a3ece..e95c929 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ scheduler.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 056eb39..00928ca 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ scheduler.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index 1ee05d9..fa09d30 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ scheduler.c \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index e068b13..c7d3edf 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ string.c \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index 58563b7..d7606cc 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ string.c \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 05b7a5b..90c43f7 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ string.c \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 590b4b8..5d644a3 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -20,12 +20,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ string.c \ diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 0cc3341..3edfcd0 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -21,12 +21,14 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ + iob.c \ locale.c \ lock.c \ main.c \ math.c \ mbcs.c \ misc.c \ + onexit.c \ process.c \ scanf.c \ string.c \

1 0

Alexandre Julliard : toolhelp: Avoid using libwine functions.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: wine Branch: master Commit: e5590cbe6acb9d843c495970c71def597ab9e2ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5590cbe6acb9d843c495970… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 17:52:50 2019 +0200 toolhelp: Avoid using libwine functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 ++ dlls/toolhelp.dll16/toolhelp.c | 19 ++++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index cf80439..ddd321c 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -709,6 +709,8 @@ @ stdcall -arch=win32 GetExeVersion16() @ stdcall -arch=win32 GetExpWinVer16(long) @ stdcall -arch=win32 GetModuleHandle16(str) +@ stdcall -arch=win32 GetSelectorBase(long) +@ stdcall -arch=win32 GetSelectorLimit16(long) @ stdcall -arch=win32 GlobalReAlloc16(long long long) @ stdcall -arch=win32 InitTask16(ptr) @ stdcall -arch=win32 IsBadReadPtr16(long long) diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 47c2d2d..02e8d6a 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -36,7 +36,6 @@ #include "wine/winbase16.h" #include "toolhelp.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolhelp); @@ -639,15 +638,12 @@ void WINAPI TerminateApp16(HTASK16 hTask, WORD wFlags) */ DWORD WINAPI MemoryRead16( WORD sel, DWORD offset, void *buffer, DWORD count ) { - LDT_ENTRY entry; - DWORD limit; + char *base = (char *)GetSelectorBase( sel ); + DWORD limit = GetSelectorLimit16( sel ); - wine_ldt_get_entry( sel, &entry ); - if (wine_ldt_is_empty( &entry )) return 0; - limit = wine_ldt_get_limit( &entry ); if (offset > limit) return 0; if (offset + count > limit + 1) count = limit + 1 - offset; - memcpy( buffer, (char *)wine_ldt_get_base(&entry) + offset, count ); + memcpy( buffer, base + offset, count ); return count; } @@ -657,15 +653,12 @@ DWORD WINAPI MemoryRead16( WORD sel, DWORD offset, void *buffer, DWORD count ) */ DWORD WINAPI MemoryWrite16( WORD sel, DWORD offset, void *buffer, DWORD count ) { - LDT_ENTRY entry; - DWORD limit; + char *base = (char *)GetSelectorBase( sel ); + DWORD limit = GetSelectorLimit16( sel ); - wine_ldt_get_entry( sel, &entry ); - if (wine_ldt_is_empty( &entry )) return 0; - limit = wine_ldt_get_limit( &entry ); if (offset > limit) return 0; if (offset + count > limit) count = limit + 1 - offset; - memcpy( (char *)wine_ldt_get_base(&entry) + offset, buffer, count ); + memcpy( base + offset, buffer, count ); return count; }

1 0

Alexandre Julliard : user.exe: Avoid using libwine functions.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: wine Branch: master Commit: 0d7d0427d0a1b8b8e4b84019db4de940cf58c01f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d7d0427d0a1b8b8e4b84019… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 17:52:37 2019 +0200 user.exe: Avoid using libwine functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 1 + dlls/user.exe16/message.c | 36 +++++++++++++---------------------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index f20d69e..cf80439 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -726,6 +726,7 @@ @ stdcall -arch=win32 LocalCountFree16() @ stdcall -arch=win32 LocalHeapSize16() @ stdcall -arch=win32 LockResource16(long) +@ stdcall -arch=win32 PrestoChangoSelector16(long long) @ stdcall -arch=win32 SetSelectorBase(long long) @ stdcall -arch=win32 SetSelectorLimit16(long long) @ stdcall -arch=win32 SizeofResource16(long long) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index c0b60ad..dd15707 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -30,7 +30,6 @@ #include "winerror.h" #include "dde.h" #include "user_private.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); @@ -98,13 +97,12 @@ static LRESULT call_window_proc_callback( HWND hwnd, UINT msg, WPARAM wp, LPARAM #include "pshpack1.h" typedef struct { - BYTE popl_eax; /* popl %eax (return address) */ - BYTE pushl_func; /* pushl $proc */ + WORD popl_eax; /* popl %eax (return address) */ + WORD pushl_func; /* pushl $proc */ WNDPROC proc; - BYTE pushl_eax; /* pushl %eax */ + WORD pushl_eax; /* pushl %eax */ BYTE ljmp; /* ljmp relay*/ - DWORD relay_offset; /* __wine_call_wndproc */ - WORD relay_sel; + FARPROC16 relay; /* __wine_call_wndproc */ } WINPROC_THUNK; #include "poppack.h" @@ -155,28 +153,22 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) if (!thunk_array) /* allocate the array and its selector */ { - LDT_ENTRY entry; - assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); - if (!(thunk_selector = wine_ldt_alloc_entries(1))) return NULL; - if (!(thunk_array = VirtualAlloc( NULL, MAX_WINPROCS16 * sizeof(WINPROC_THUNK), MEM_COMMIT, - PAGE_EXECUTE_READWRITE ))) return NULL; - wine_ldt_set_base( &entry, thunk_array ); - wine_ldt_set_limit( &entry, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) - 1 ); - wine_ldt_set_flags( &entry, WINE_LDT_FLAGS_CODE | WINE_LDT_FLAGS_32BIT ); - wine_ldt_set_entry( thunk_selector, &entry ); + if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) + return NULL; + PrestoChangoSelector16( thunk_selector, thunk_selector ); + thunk_array = GlobalLock16( thunk_selector ); relay = GetProcAddress16( GetModuleHandle16("user"), "__wine_call_wndproc" ); } thunk = &thunk_array[index]; - thunk->popl_eax = 0x58; /* popl %eax */ - thunk->pushl_func = 0x68; /* pushl $proc */ + thunk->popl_eax = 0x5866; /* popl %eax */ + thunk->pushl_func = 0x6866; /* pushl $proc */ thunk->proc = handle; - thunk->pushl_eax = 0x50; /* pushl %eax */ - thunk->ljmp = 0xea; /* ljmp relay*/ - thunk->relay_offset = OFFSETOF(relay); - thunk->relay_sel = SELECTOROF(relay); + thunk->pushl_eax = 0x5066; /* pushl %eax */ + thunk->ljmp = 0xea; /* ljmp relay*/ + thunk->relay = relay; return (WNDPROC16)MAKESEGPTR( thunk_selector, index * sizeof(WINPROC_THUNK) ); } @@ -251,8 +243,6 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA memset(&context, 0, sizeof(context)); context.SegDs = context.SegEs = SELECTOROF(NtCurrentTeb()->WOW32Reserved); - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); if (!(context.Eax = GetWindowWord( HWND_32(hwnd), GWLP_HINSTANCE ))) context.Eax = context.SegDs; context.SegCs = SELECTOROF(func); context.Eip = OFFSETOF(func);

1 0

Józef Kucia : tests: Actually test count buffers with indirect draws.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: vkd3d Branch: master Commit: ad97f39d9a3d7862f281b039f795de0b1c82aa09 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ad97f39d9a3d7862f281b03… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 21 10:57:20 2019 +0200 tests: Actually test count buffers with indirect draws. 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 | 62 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5ad3ea7..87addc3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21589,6 +21589,11 @@ static void test_execute_indirect(void) {{-1.0f, 0.5f, 0.0f, 1.0f}, 0xff00ff00}, {{ 0.5f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, {{ 0.5f, 0.5f, 0.0f, 1.0f}, 0xff00ff00}, + + {{-1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, }; static const uint32_t indices[] = {0, 1, 2, 3, 2, 1}; static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = @@ -21672,26 +21677,42 @@ static void test_execute_indirect(void) }; static const struct argument_data { - D3D12_DRAW_ARGUMENTS draw; + D3D12_DRAW_ARGUMENTS draws[4]; D3D12_DISPATCH_ARGUMENTS dispatch; D3D12_DRAW_INDEXED_ARGUMENTS indexed_draws[2]; } argument_data = { - {3, 1, 0, 0}, + {{6, 1, 4, 0}, {6, 1, 8, 0}, {6, 1, 0, 0}}, {2, 3, 4}, {{6, 1, 0, 0, 0}, {6, 1, 0, 4, 0}}, }; - static const uint32_t count_data[] = {1, 2}; + static const uint32_t count_data[] = {2, 1}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; memset(&desc, 0, sizeof(desc)); desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + desc.no_pipeline = true; if (!init_test_context(&context, &desc)) return; command_list = context.list; queue = context.queue; + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + ib = create_upload_buffer(context.device, sizeof(indices), indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = sizeof(indices); + ibv.Format = DXGI_FORMAT_R32_UINT; + argument_buffer = create_upload_buffer(context.device, sizeof(argument_data), &argument_data); count_buffer = create_upload_buffer(context.device, sizeof(count_data), count_data); @@ -21702,10 +21723,11 @@ static void test_execute_indirect(void) 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_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, argument_buffer, 0, NULL, 0); + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 2, argument_buffer, 0, NULL, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -21720,10 +21742,11 @@ static void test_execute_indirect(void) 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_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 1, argument_buffer, 0, + ID3D12GraphicsCommandList_ExecuteIndirect(command_list, command_signature, 4, argument_buffer, 0, count_buffer, 0); transition_resource_state(command_list, context.render_target, @@ -21776,22 +21799,6 @@ static void test_execute_indirect(void) ID3D12CommandSignature_Release(command_signature); command_signature = create_command_signature(context.device, D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED); - ID3D12PipelineState_Release(context.pipeline_state); - input_layout.pInputElementDescs = layout_desc; - input_layout.NumElements = ARRAY_SIZE(layout_desc); - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); - - vb = create_upload_buffer(context.device, sizeof(vertices), vertices); - vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); - vbv.StrideInBytes = sizeof(*vertices); - vbv.SizeInBytes = sizeof(vertices); - - ib = create_upload_buffer(context.device, sizeof(indices), indices); - ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); - ibv.SizeInBytes = sizeof(indices); - ibv.Format = DXGI_FORMAT_R32_UINT; - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -21837,14 +21844,7 @@ static void test_execute_indirect(void) 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); - set_box(&box, 0, 0, 0, 32, 8, 1); - check_readback_data_uint(&rb, &box, 0xffffff00, 0); - set_box(&box, 24, 8, 0, 32, 32, 1); - check_readback_data_uint(&rb, &box, 0xffffff00, 0); - set_box(&box, 0, 8, 0, 24, 32, 1); - check_readback_data_uint(&rb, &box, 0xff00ff00, 0); - release_resource_readback(&rb); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffff00, 0); ID3D12PipelineState_Release(pipeline_state); ID3D12RootSignature_Release(root_signature);

1 0

Józef Kucia : vkd3d: Always return render pass from d3d12_pipeline_state_get_or_create_pipeline ().
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: vkd3d Branch: master Commit: 3e99853297854eb3b91268a0e71a51322d632573 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e99853297854eb3b91268a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 21 10:57:22 2019 +0200 vkd3d: Always return render pass from d3d12_pipeline_state_get_or_create_pipeline(). 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 | 3 --- libs/vkd3d/state.c | 13 ++++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2fdd980..a4659f7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2431,9 +2431,6 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list list->primitive_topology, list->strides, list->dsv_format, &vk_render_pass))) return false; - if (!vk_render_pass) - vk_render_pass = list->state->u.graphics.render_pass; - /* The render pass cache ensures that we use the same Vulkan render pass * object for compatible render passes. */ if (list->pso_render_pass != vk_render_pass) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c5f66b6..eb2626d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2761,8 +2761,6 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta assert(d3d12_pipeline_state_is_graphics(state)); - *vk_render_pass = VK_NULL_HANDLE; - memset(&pipeline_key, 0, sizeof(pipeline_key)); pipeline_key.topology = topology; @@ -2853,22 +2851,23 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta pipeline_desc.pColorBlendState = &blend_desc; pipeline_desc.pDynamicState = &dynamic_desc; pipeline_desc.layout = graphics->root_signature->vk_pipeline_layout; - pipeline_desc.renderPass = graphics->render_pass; pipeline_desc.subpass = 0; pipeline_desc.basePipelineHandle = VK_NULL_HANDLE; pipeline_desc.basePipelineIndex = -1; /* Create a render pass for pipelines with DXGI_FORMAT_UNKNOWN. */ - if (!pipeline_desc.renderPass) + if (!(pipeline_desc.renderPass = graphics->render_pass)) { - TRACE("Compiling %p with DSV format %#x.\n", state, dsv_format); + if (graphics->null_attachment_mask & (1u << graphics->rt_count)) + TRACE("Compiling %p with DSV format %#x.\n", state, dsv_format); + if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device, dsv_format, &pipeline_desc.renderPass))) return VK_NULL_HANDLE; - - *vk_render_pass = pipeline_desc.renderPass; } + *vk_render_pass = pipeline_desc.renderPass; + if ((vr = VK_CALL(vkCreateGraphicsPipelines(device->vk_device, device->vk_pipeline_cache, 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) {

1 0

Józef Kucia : vkd3d-shader: Add enum for minimum-precision data types.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: vkd3d Branch: master Commit: faeb03c1a36da8ccaddf26bb1c0e745b1edad000 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=faeb03c1a36da8ccaddf26b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 21 10:57:19 2019 +0200 vkd3d-shader: Add enum for minimum-precision data types. 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_shader.h | 11 ++++++++++- libs/vkd3d-shader/dxbc.c | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 318a438..e6cccd8 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -571,6 +571,15 @@ enum vkd3d_sysval_semantic VKD3D_FORCE_32_BIT_ENUM(VKD3D_SYSVAL_SEMANTIC), }; +enum vkd3d_shader_minimum_precision +{ + VKD3D_SHADER_MINIMUM_PRECISION_NONE = 0, + VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_16 = 1, + VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, + VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, + VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, +}; + struct vkd3d_shader_signature_element { const char *semantic_name; @@ -580,7 +589,7 @@ struct vkd3d_shader_signature_element enum vkd3d_component_type component_type; unsigned int register_index; unsigned int mask; - unsigned int min_precision; + enum vkd3d_shader_minimum_precision min_precision; }; struct vkd3d_shader_signature diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 92ea174..a9cda49 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1992,11 +1992,11 @@ static int parse_dxbc(const char *data, size_t data_size, static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, struct vkd3d_shader_signature *s) { + bool has_stream_index, has_min_precision; struct vkd3d_shader_signature_element *e; const char *ptr = data; unsigned int i; DWORD count; - bool has_stream_index, has_min_precision; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -2032,6 +2032,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, read_dword(&ptr, &e[i].stream_index); else e[i].stream_index = 0; + read_dword(&ptr, &name_offset); if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { @@ -2048,7 +2049,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, if (has_min_precision) read_dword(&ptr, &e[i].min_precision); else - e[i].min_precision = 0; + e[i].min_precision = VKD3D_SHADER_MINIMUM_PRECISION_NONE; TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x, precision %u.\n",

1 0

Józef Kucia : tests: Test RTVFormat equal to DXGI_FORMAT_UNKNOWN with depth-stencil.
by Alexandre Julliard May 21, 2019

May 21, 2019

Module: vkd3d Branch: master Commit: 725c4eb809550cd6bf70fc36e123145e127bc0f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=725c4eb809550cd6bf70fc3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 21 10:57:21 2019 +0200 tests: Test RTVFormat equal to DXGI_FORMAT_UNKNOWN with depth-stencil. 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 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 87addc3..5c44563 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4749,6 +4749,7 @@ static void test_unknown_rtv_format(void) D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; D3D12_CPU_DESCRIPTOR_HANDLE rtvs[3]; ID3D12Resource *render_targets[2]; + struct depth_stencil_resource ds; struct test_context_desc desc; struct test_context context; ID3D12CommandQueue *queue; @@ -4784,11 +4785,17 @@ static void test_unknown_rtv_format(void) command_list = context.list; queue = context.queue; + init_depth_stencil(&ds, context.device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); pso_desc.NumRenderTargets = ARRAY_SIZE(rtvs); for (i = 0; i < ARRAY_SIZE(rtvs); ++i) pso_desc.RTVFormats[i] = desc.rt_format; pso_desc.RTVFormats[0] = DXGI_FORMAT_UNKNOWN; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); @@ -4811,10 +4818,11 @@ static void test_unknown_rtv_format(void) ID3D12Device_CreateRenderTargetView(context.device, NULL, &rtv_desc, get_cpu_rtv_handle(&context, context.rtv_heap, 0)); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, FALSE, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, ARRAY_SIZE(rtvs), rtvs, FALSE, &ds.dsv_handle); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); @@ -4834,8 +4842,14 @@ static void test_unknown_rtv_format(void) expected_vec4.x = 3.0f; check_sub_resource_vec4(render_targets[1], 0, queue, command_list, &expected_vec4, 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + for (i = 0; i < ARRAY_SIZE(render_targets); ++i) ID3D12Resource_Release(render_targets[i]); + destroy_depth_stencil(&ds); destroy_test_context(&context); }

1 0

Jactry Zeng : msscript: Partially implement IScriptControl::Eval().
by Alexandre Julliard May 20, 2019

May 20, 2019

Module: wine Branch: master Commit: 21ae9ba1ba8ddba3ba49e916ef2b7fbd5ae9713d URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ae9ba1ba8ddba3ba49e916… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri May 10 15:21:30 2019 +0800 msscript: Partially implement IScriptControl::Eval(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41657 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 21 +++++- dlls/msscript.ocx/tests/msscript.c | 132 +++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index ae5edb7..9044c49 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -973,8 +973,27 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); + EXCEPINFO excepinfo; + HRESULT hr; + FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); - return E_NOTIMPL; + + if (!res) + return E_POINTER; + V_VT(res) = VT_EMPTY; + + if (!This->host || This->state != Initialized) + return E_FAIL; + + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + + hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, + 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); + /* FIXME: more error hanlding */ + + return hr; } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 47ae76d..2d500d8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1356,6 +1356,137 @@ static void test_State(void) IScriptControl_Release(sc); } +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len - 1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +#define CHECK_ERROR(sc,exp_num) _check_error(sc, exp_num, __LINE__) +static void _check_error(IScriptControl *sc, LONG exp_num, int line) +{ + IScriptError *script_err; + LONG error_num; + HRESULT hr; + + hr = IScriptControl_get_Error(sc, &script_err); + ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + if (SUCCEEDED(hr)) + { + error_num = 0xdeadbeef; + hr = IScriptError_get_Number(script_err, &error_num); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + error_num, exp_num); + IScriptError_Release(script_err); + } +} + +static void test_IScriptControl_Eval(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR script_str, language, expected_string; + VARIANT var; + ScriptControlStates state; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + hr = IScriptControl_Eval(sc, NULL, NULL); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + + script_str = a2bstr("1 + 1"); + hr = IScriptControl_Eval(sc, script_str, NULL); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + SysFreeString(script_str); + + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, NULL, &var); + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + todo_wine CHECK_ERROR(sc, 0); + + script_str = a2bstr("1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(state == Initialized, "got wrong state: %d\n", state); + SysFreeString(language); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 2), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(state == Initialized, "got wrong state: %d\n", state); + SysFreeString(script_str); + + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 12), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + script_str = a2bstr("invalid syntax"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d\n", V_VT(&var)); + ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, + "V_I4(var) = %d.\n", V_I4(&var)); + SysFreeString(script_str); + todo_wine CHECK_ERROR(sc, 1004); + + script_str = a2bstr("var2 = var1 + var2"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 14), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + + script_str = a2bstr("\"Hello\""); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + expected_string = a2bstr("Hello"); + ok((V_VT(&var) == VT_BSTR) && (!lstrcmpW(V_BSTR(&var), expected_string)), + "V_VT(var) = %d, V_BSTR(var) = %s.\n", V_VT(&var), wine_dbgstr_w(V_BSTR(&var))); + SysFreeString(expected_string); + SysFreeString(script_str); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1385,6 +1516,7 @@ START_TEST(msscript) test_AllowUI(); test_UseSafeSubset(); test_State(); + test_IScriptControl_Eval(); CoUninitialize(); }

1 0