November 2019 - Wine-commits

Paul Gofman : wined3d: Factor out wined3d_context_gl_create_wgl() function.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: ecad635124866602b8577339bca9a8f886ec7f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecad635124866602b8577339… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 18:06:11 2019 +0330 wined3d: Factor out wined3d_context_gl_create_wgl() function. 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/wined3d/context.c | 232 +++++++++++++++++++++++++++---------------------- 1 file changed, 128 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecad635124866602b857…

1 0

Paul Gofman : wined3d: Create a backup context if setting the pixel format failed in wined3d_context_gl_create_wgl_ctx().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 645eb62f709275ac46c2a7ea59bf8bcba34c7edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=645eb62f709275ac46c2a7ea… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 18:06:12 2019 +0330 wined3d: Create a backup context if setting the pixel format failed in wined3d_context_gl_create_wgl_ctx(). 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/wined3d/context.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b8402bfe4..c5d2eeaa47 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2033,9 +2033,27 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context if (!wined3d_context_gl_set_pixel_format(context_gl)) { - ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); context_release(context); - return FALSE; + + if (context_gl->dc_is_private) + { + ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); + + return FALSE; + } + + WARN("Failed to set pixel format %d on device context %p, trying backup DC.\n", + context_gl->pixel_format, context_gl->dc); + + wined3d_release_dc(context_gl->window, context_gl->dc); + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + { + ERR("Failed to retrieve the backup device context.\n"); + return E_FAIL; + } + context_gl->dc_is_private = TRUE; + + return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL;

1 0

Sven Baars : msvcp140/tests: Test _Stat() against the actual permissions of the system directory.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: da42f2e0752e6bf02bd40c3a3ecb4a02157a11b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da42f2e0752e6bf02bd40c3a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Nov 15 20:30:46 2019 +0100 msvcp140/tests: Test _Stat() against the actual permissions of the system directory. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8ad172495d..751b1beed8 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -786,8 +786,9 @@ static void test_Current_set(void) static void test_Stat(void) { - int i, perms, ret; + int i, perms, expected_perms, ret; HANDLE file; + DWORD attr; enum file_type val; WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; @@ -889,10 +890,12 @@ static void test_Stat(void) } GetSystemDirectoryW(sys_path, MAX_PATH); + attr = GetFileAttributesW(sys_path); + expected_perms = (attr & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777; perms = 0xdeadbeef; val = p_Stat(sys_path, &perms); ok(directory_file == val, "_Stat(): expect: regular, got %d\n", val); - ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms); + ok(perms == expected_perms, "_Stat(): perms expect: 0%o, got 0%o\n", expected_perms, perms); if(ret) { todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n");

1 0

Damjan Jovanovic : winedbg: Allow changing the current thread.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 8c52c17a08799a71436cd72ecf2c107548d5df82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c52c17a08799a71436cd72e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 16 13:39:30 2019 +0200 winedbg: Allow changing the current thread. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 1 + programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 23 +++++++++++++++++++++++ programs/winedbg/winedbg.man.in | 3 +++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 126eef2239..ac76b5baf8 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -139,6 +139,7 @@ command: | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } + | tTHREAD tNUM { dbg_set_curr_thread($2); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} | tECHO tSTRING { dbg_printf("%s\n", $2); } diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index ef7a2eb42b..79cb8ccd3a 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -187,6 +187,7 @@ STRING \"[^\n"]+\" <INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d { BEGIN(NOCMD); return tDISPLAY; } <INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { BEGIN(NOCMD); return tUNDISPLAY; } <INITIAL>delete|delet|dele|del { BEGIN(BD_CMD); return tDELETE; } +<INITIAL>thread|threa|thre|thr|th { BEGIN(NOCMD); return tTHREAD; } <INITIAL,NOPROCESS>quit|qui|qu|q { BEGIN(NOCMD); return tQUIT; } <INITIAL>set|se { BEGIN(NOCMD); return tSET; } <INITIAL>x { BEGIN(FORMAT_EXPECTED); return tEXAM; } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d8d7a699fb..40d93d669c 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -427,6 +427,7 @@ extern enum sym_get_lval symbol_picker_scoped(const char* name, const struct sgv extern void dbg_run_debuggee(const char* args); extern void dbg_wait_next_exception(DWORD cont, int count, int mode); extern enum dbg_start dbg_active_attach(int argc, char* argv[]); +extern BOOL dbg_set_curr_thread(DWORD tid); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); extern enum dbg_start dbg_active_minidump(int argc, char* argv[]); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bf5ba4f6e3..123cbc934e 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -66,7 +66,7 @@ void print_help(void) " show dir dir <path>", " set <reg> = <expr> set *<addr> = <expr>", " pass whatis", - " info (see 'help info' for options)", + " info (see 'help info' for options) thread <tid>", "The 'x' command accepts repeat counts and formats (including 'i') in the", "same way that gdb does.\n", diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 71e0bc1944..2b38ce95de 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -98,6 +98,29 @@ static unsigned dbg_fetch_context(void) return TRUE; } +BOOL dbg_set_curr_thread(DWORD tid) +{ + struct dbg_thread* thread; + + if (!dbg_curr_process) + { + dbg_printf("No process loaded\n"); + return FALSE; + } + + thread = dbg_get_thread(dbg_curr_process, tid); + if (thread) + { + dbg_curr_thread = thread; + dbg_fetch_context(); + stack_fetch_frames(&dbg_context); + dbg_curr_tid = tid; + return TRUE; + } + dbg_printf("No such thread\n"); + return thread != NULL; +} + /*********************************************************************** * dbg_exception_prolog * diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 6f38bc07b9..6ed8d4474c 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -116,6 +116,9 @@ IDs can be obtained using the \fBinfo\ process\fR command. Note the .IP .IP \fBdetach\fR Detach from a Wine-process. +.IP \fBthread\ \fIN\fR +Change the current thread to \fIN\fR (its Windows TID, numeric or hexadecimal). +.IP .PP \fIHelp commands\fR .IP \fBhelp\fR

1 0

João Diogo Ferreira : kernel32/nls: Add LOCALE_IGEOID to all locales.
by Alexandre Julliard 18 Nov '19

18 Nov '19

1 0

Alexandre Julliard : comctl32/tests: Avoid size_t in traces.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: c799c1ea36f577ffde216e2543761ddbc6c09086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c799c1ea36f577ffde216e25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 18 22:27:55 2019 +0100 comctl32/tests: Avoid size_t in traces. --- dlls/comctl32/tests/treeview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eb63439f0b..fac8e8b6b8 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1695,7 +1695,7 @@ static void test_itemedit(void) r = SetWindowTextA(edit, buffA); expect(TRUE, r); r = GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); - expect(ARRAY_SIZE(buffA) - 1, r); + ok( r == ARRAY_SIZE(buffA) - 1, "got %d\n", r ); /* ...but it's trimmed to MAX_PATH chars when editing ends */ r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); @@ -1705,7 +1705,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, lstrlenA(item.pszText)); /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1723,7 +1723,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, lstrlenA(item.pszText)); /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot);

1 0

Paul Gofman : d3dx9: Avoid double freeing samplers.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 6aced396bad8bea61733fda24f0cecabaec5041e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aced396bad8bea61733fda2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:41 2019 +0100 d3dx9: Avoid double freeing samplers. 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/effect.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ad81cb68cb..eefd14aafa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -516,8 +516,7 @@ static void free_sampler(struct d3dx_sampler *sampler) { free_state(&sampler->states[i]); } - HeapFree(GetProcessHeap(), 0, sampler->states); - HeapFree(GetProcessHeap(), 0, sampler); + heap_free(sampler->states); } static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); @@ -531,7 +530,7 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) switch (param->type) { case D3DXPT_STRING: - HeapFree(GetProcessHeap(), 0, *(char **)param->data); + heap_free(*(char **)param->data); break; case D3DXPT_TEXTURE: @@ -557,8 +556,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) break; } } - if (!child) - HeapFree(GetProcessHeap(), 0, param->data); + if (!child || is_param_type_sampler(param->type)) + heap_free(param->data); } static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child)

1 0

Paul Gofman : d3dx9/tests: Add test for effect parameter block.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 61ee765aa0ec0d0e478a9f82d73e602ea71419c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ee765aa0ec0d0e478a9f82… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:42 2019 +0100 d3dx9/tests: Add test for effect parameter block. 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 | 245 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61ee765aa0ec0d0e478a…

1 0

Matteo Bruni : d3dx9/tests: Test ApplyParameterBlock() while recording.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 85d3ad879d5b13f7fce378009aaf80b419ad6185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d3ad879d5b13f7fce37800… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 18 16:59:43 2019 +0100 d3dx9/tests: Test ApplyParameterBlock() while recording. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 84 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 1a177d7a8b..922d8247b1 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8018,8 +8018,8 @@ static void test_effect_parameter_block(void) D3DPRESENT_PARAMETERS present_parameters = {0}; static const float float_array_zero[4]; IDirect3DTexture9 *texture, *tex_test; + D3DXHANDLE block, block2, handle; ID3DXEffect *effect, *effect2; - D3DXHANDLE block, handle; IDirect3DDevice9 *device; ID3DXEffectPool *pool; float float_array[4]; @@ -8216,6 +8216,86 @@ static void test_effect_parameter_block(void) hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value); todo_wine ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4); + todo_wine ok(hr == D3D_OK && float_array[0] == -29.0f + && !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v2 (%g, %g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2], float_array[3]); + + /* Test applying a parameter block while recording a new one. */ + hr = effect->lpVtbl->SetFloat(effect, "arr2[0]", 0.0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "arr2[1]", 0.0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v1", float_array_zero, 3); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "ts1[0].fv", 0.0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetFloatArray(effect, "ts1[0].v2", float_array_zero, 4); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memset(&mat, 0, sizeof(mat)); + hr = effect->lpVtbl->SetMatrix(effect, "m3x2row", &effect_orig_mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->SetMatrix(effect, "m3x2column", &effect_orig_mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = effect->lpVtbl->BeginParameterBlock(effect); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = effect->lpVtbl->ApplyParameterBlock(effect, block); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloat(effect, "arr2[1]", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v1", float_array, 3); + ok(hr == D3D_OK && !memcmp(float_array, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v1 (%g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2]); + + hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n"); + hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &effect_orig_mat, sizeof(mat)), "Got unexpected matrix.\n"); + + hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4); + ok(hr == D3D_OK && float_array[0] == 0.0f + && !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v2 (%g, %g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2], float_array[3]); + + block2 = effect->lpVtbl->EndParameterBlock(effect); + todo_wine ok(!!block2, "Got unexpected block %p.\n", block2); + + hr = effect->lpVtbl->ApplyParameterBlock(effect, block2); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = effect->lpVtbl->GetFloat(effect, "arr2[0]", &float_value); + todo_wine ok(hr == D3D_OK && float_value == 92.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloat(effect, "arr2[1]", &float_value); + ok(hr == D3D_OK && float_value == 0.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v1", float_array, 3); + ok(hr == D3D_OK && !memcmp(float_array, float_array_zero, 3 * sizeof(*float_array)), + "Got unexpected hr %#x, ts1[0].v1 (%g, %g, %g).\n", hr, + float_array[0], float_array[1], float_array[2]); + + hr = effect->lpVtbl->GetMatrix(effect, "m3x2row", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n"); + hr = effect->lpVtbl->GetMatrix(effect, "m3x2column", &mat); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!memcmp(&mat, &test_mat, sizeof(mat)), "Got unexpected matrix.\n"); + + hr = effect->lpVtbl->GetFloat(effect, "ts1[0].fv", &float_value); + todo_wine ok(hr == D3D_OK && float_value == 28.0f, "Got unexpected hr %#x, float_value %g.\n", hr, float_value); + hr = effect->lpVtbl->GetFloatArray(effect, "ts1[0].v2", float_array, 4); todo_wine ok(hr == D3D_OK && float_array[0] == -29.0f && !memcmp(float_array + 1, float_array_zero, 3 * sizeof(*float_array)), @@ -8224,6 +8304,8 @@ static void test_effect_parameter_block(void) hr = effect->lpVtbl->DeleteParameterBlock(effect, block); todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->DeleteParameterBlock(effect, block2); + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->SetTexture(effect, "tex1", NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Paul Gofman : d3dx9: Implement d3dx_effect_BeginParameterBlock().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: e281ba4db6654850caf713ab09aa6a2057e1d064 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e281ba4db6654850caf713ab… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Nov 18 16:59:44 2019 +0100 d3dx9: Implement d3dx_effect_BeginParameterBlock(). 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/effect.c | 34 +++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 4 ++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index eefd14aafa..4be7c7b6bc 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -30,6 +30,7 @@ #define INT_FLOAT_MULTI_INVERSE (1/INT_FLOAT_MULTI) static const char parameter_magic_string[4] = {'@', '!', '#', '\xFF'}; +static const char parameter_block_magic_string[4] = {'@', '!', '#', '\xFE'}; #define PARAMETER_FLAG_SHARED 1 @@ -147,6 +148,11 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; +struct d3dx_parameter_block +{ + char magic_string[ARRAY_SIZE(parameter_block_magic_string)]; +}; + struct d3dx_effect { ID3DXEffect ID3DXEffect_iface; @@ -177,6 +183,8 @@ struct d3dx_effect unsigned int light_updated; D3DMATERIAL9 current_material; BOOL material_updated; + + struct d3dx_parameter_block *current_parameter_block; }; #define INITIAL_SHARED_DATA_SIZE 4 @@ -668,6 +676,14 @@ static void free_technique(struct d3dx_technique *technique) technique->name = NULL; } +static void free_parameter_block(struct d3dx_parameter_block *block) +{ + if (!block) + return; + + heap_free(block); +} + static void d3dx_effect_cleanup(struct d3dx_effect *effect) { ID3DXEffectPool *pool; @@ -675,6 +691,8 @@ static void d3dx_effect_cleanup(struct d3dx_effect *effect) TRACE("effect %p.\n", effect); + free_parameter_block(effect->current_parameter_block); + heap_free(effect->full_name_tmp); if (effect->parameters) @@ -4045,11 +4063,21 @@ static HRESULT WINAPI d3dx_effect_GetStateManager(ID3DXEffect *iface, ID3DXEffec static HRESULT WINAPI d3dx_effect_BeginParameterBlock(ID3DXEffect *iface) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + if (effect->current_parameter_block) + { + WARN("Parameter block is already started.\n"); + return D3DERR_INVALIDCALL; + } + + effect->current_parameter_block = heap_alloc_zero(sizeof(*effect->current_parameter_block)); + memcpy(effect->current_parameter_block->magic_string, parameter_block_magic_string, + sizeof(parameter_block_magic_string)); + + return D3D_OK; } static D3DXHANDLE WINAPI d3dx_effect_EndParameterBlock(ID3DXEffect *iface) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 922d8247b1..bb9604194d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8065,9 +8065,9 @@ static void test_effect_parameter_block(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = effect->lpVtbl->BeginParameterBlock(effect); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); block = effect->lpVtbl->EndParameterBlock(effect); todo_wine ok(!!block, "Got unexpected block %p.\n", block); handle = effect->lpVtbl->EndParameterBlock(effect);

1 0