wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Jacek Caban : widl: Fixed fwrite error handling.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 430c3d0be2cb3478c6a308683695aef4f0480f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=430c3d0be2cb3478c6a308683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 12:05:45 2012 +0200 widl: Fixed fwrite error handling. --- tools/widl/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c75a6ac..d8b34d9 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -266,7 +266,7 @@ void write_regscript( const statement_list_t *stmts ) { FILE *f = fopen( regscript_name, "w" ); if (!f) error( "Could not open %s for output\n", regscript_name ); - if (fwrite( output_buffer, output_buffer_pos, 1, f ) != output_buffer_pos) + if (fwrite( output_buffer, 1, output_buffer_pos, f ) != output_buffer_pos) error( "Failed to write to %s\n", regscript_name ); if (fclose( f )) error( "Failed to write to %s\n", regscript_name );

1 0

Jacek Caban : widl: Alloc big enough buffer in dup_basename to handle registration suffix.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: da0f33370a35fcadf743e2f56cdf7f71bd2e24db URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0f33370a35fcadf743e2f56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 5 12:05:26 2012 +0200 widl: Alloc big enough buffer in dup_basename to handle registration suffix. --- tools/widl/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/utils.c b/tools/widl/utils.c index dc77ae8..9066887 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -159,8 +159,8 @@ char *dup_basename(const char *name, const char *ext) namelen = strlen(name); - /* +4 for later extension and +1 for '\0' */ - base = xmalloc(namelen +4 +1); + /* +6 for later extension (strlen("_r.rgs")) and +1 for '\0' */ + base = xmalloc(namelen +6 +1); strcpy(base, name); if(!strcasecmp(name + namelen-extlen, ext)) {

1 0

Francois Gouget : shell32/tests: Greatly expand the test_argify() tests.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 61f894c5764e724287db0ea84d204c6c6098a9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f894c5764e724287db0ea84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:47:09 2012 +0200 shell32/tests: Greatly expand the test_argify() tests. --- dlls/shell32/tests/shlexec.c | 323 +++++++++++++++++++++++++++++------------- 1 files changed, 227 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f894c5764e724287db0…

1 0

Francois Gouget : shell32/tests: Merge shlexec's test_exes_long() with the other parameter passing tests.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: e440a7d22cae7daa01513db643d05d0ab2321151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e440a7d22cae7daa01513db64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:43:13 2012 +0200 shell32/tests: Merge shlexec's test_exes_long() with the other parameter passing tests. Also remove the pointless noassoc test (duplicated from test_exes()). --- dlls/shell32/tests/shlexec.c | 52 +++++++++-------------------------------- 1 files changed, 12 insertions(+), 40 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6c0ff6c..cd5b578 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1197,7 +1197,7 @@ static void test_commandline2argv(void) static void test_argify(void) { - char fileA[MAX_PATH]; + char fileA[MAX_PATH], params[1024]; INT_PTR rc; sprintf(fileA, "%s\\test file.shlexec", tmpdir); @@ -1294,6 +1294,17 @@ static void test_argify(void) } } + /* Test with a long parameter */ + for (rc = 0; rc < MAX_PATH; rc++) + fileA[rc] = 'a' + rc % 26; + fileA[MAX_PATH-1] = '\0'; + sprintf(params, "shlexec \"%s\" %s", child_file, fileA); + + /* We need NOZONECHECKS on Win2003 to block a dialog */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 4); + okChildString("argvA3", fileA); } static void test_filename(void) @@ -1901,44 +1912,6 @@ static void test_exes(void) } } -static void test_exes_long(void) -{ - char filename[MAX_PATH]; - char params[2024]; - char longparam[MAX_PATH]; - INT_PTR rc; - - for (rc = 0; rc < MAX_PATH; rc++) - longparam[rc]='a'+rc%26; - longparam[MAX_PATH-1]=0; - - - sprintf(params, "shlexec \"%s\" %s", child_file,longparam); - - /* We need NOZONECHECKS on Win2003 to block a dialog */ - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL, NULL); - ok(rc > 32, "%s returned %lu\n", shell_call, rc); - okChildInt("argcA", 4); - okChildString("argvA3", longparam); - - if (! skip_noassoc_tests) - { - sprintf(filename, "%s\\test file.noassoc", tmpdir); - if (CopyFile(argv0, filename, FALSE)) - { - rc=shell_execute(NULL, filename, params, NULL); - todo_wine { - ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%lu\n", shell_call, rc); - } - } - } - else - { - win_skip("Skipping shellexecute of file with unassociated extension\n"); - } -} - typedef struct { const char* command; @@ -2517,7 +2490,6 @@ START_TEST(shlexec) test_find_executable(); test_lnks(); test_exes(); - test_exes_long(); test_dde(); test_dde_default_app(); test_directory();

1 0

Francois Gouget : shell32/tests: Add more ShellExecute() shortcut tests.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: ab654c63cf7bc16189f0f5464536c876f4a59c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab654c63cf7bc16189f0f5464… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 10:40:03 2012 +0200 shell32/tests: Add more ShellExecute() shortcut tests. --- dlls/shell32/tests/shlexec.c | 65 +++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3a7b124..6c0ff6c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -88,6 +88,9 @@ static void strcat_param(char* str, const char* name, const char* param) } } +static int _todo_wait = 0; +#define todo_wait for (_todo_wait = 1; _todo_wait; _todo_wait = 0) + static char shell_call[2048]=""; static int bad_shellexecute = 0; static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) @@ -130,7 +133,10 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L rc = SE_ERR_NOASSOC; } } - ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + if (!_todo_wait) + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); + else todo_wine + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -151,7 +157,8 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L } static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, - LPCSTR parameters, LPCSTR directory) + LPCSTR parameters, LPCSTR directory, + LPCSTR class) { SHELLEXECUTEINFO sei; BOOL success; @@ -168,6 +175,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, strcat_param(shell_call, "file", file); strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); + strcat_param(shell_call, "class", class); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call); @@ -182,7 +190,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, sei.nShow=SW_SHOWNORMAL; sei.hInstApp=NULL; /* Out */ sei.lpIDList=NULL; - sei.lpClass=NULL; + sei.lpClass=class; sei.hkeyClass=NULL; sei.dwHotKey=0; U(sei).hIcon=NULL; @@ -204,7 +212,10 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); } wait_rc=WaitForSingleObject(hEvent, 5000); - ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + if (!_todo_wait) + ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); + else todo_wine + ok(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -943,12 +954,12 @@ static void test_lpFile_parsed(void) /* test SEE_MASK_DOENVSUBST works */ rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, - NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* quoted lpFile does not work on real win95 and nt4 */ rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, - NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL, NULL); ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, "%s failed: rc=%lu\n", shell_call, rc); } @@ -1752,20 +1763,34 @@ static void test_lnks(void) const filename_tests_t* test; INT_PTR rc; + /* Should open through our association */ sprintf(filename, "%s\\test_shortcut_shlexec.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, - GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); sprintf(params, "%s\\test file.shlexec", tmpdir); get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); + todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); + todo_wine okChildPath("argvA4", filename); + + /* Should just run our executable */ sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, - GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 4); + okChildString("argvA3", "Lnk"); + + /* Lnk's ContextMenuHandler has priority over an explicit class */ + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, "shlexec.shlexec"); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); @@ -1783,7 +1808,7 @@ static void test_lnks(void) *c='/'; c++; } - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); @@ -1798,7 +1823,7 @@ static void test_lnks(void) sprintf(params+1, test->basename, tmpdir); strcat(params,"\""); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, params, - NULL); + NULL, NULL); if (rc > 32) rc=33; if ((test->todo & 0x1)==0) @@ -1854,7 +1879,7 @@ static void test_exes(void) /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL); + NULL, NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); @@ -1892,7 +1917,7 @@ static void test_exes_long(void) /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, - NULL); + NULL, NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", longparam); @@ -2069,7 +2094,7 @@ static void test_dde(void) ddeExec[0] = 0; dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); - rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL); + rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL, NULL); CloseHandle(dde_ready_event); if ((test->todo & 0x1)==0) { @@ -2186,7 +2211,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) assert(info && info->filename); PostThreadMessage(info->threadIdParent, WM_QUIT, - shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL), + shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, info->filename, NULL, NULL, NULL), 0L); ExitThread(0); } @@ -2458,11 +2483,11 @@ static void test_directory(void) sprintf(params, "shlexec \"%s\" Exec", child_file); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, NULL); + NULL, path_find_file_name(argv0), params, NULL, NULL); todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, - NULL, path_find_file_name(argv0), params, newdir); + NULL, path_find_file_name(argv0), params, newdir, NULL); ok(rc > 32, "%s returned %lu\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec");

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_AND in the GLSL shader backend.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 09315227952f9e1ca56a2c8bd4bab24db37dcb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09315227952f9e1ca56a2c8bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:18 2012 +0200 wined3d: Implement WINED3DSIH_AND in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bc262ec..e2d2bb9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2184,8 +2184,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s * Begin processing individual instruction opcodes ****************************************************************************/ -/* Generate GLSL arithmetic functions (dst = src1 + src2) */ -static void shader_glsl_arith(const struct wined3d_shader_instruction *ins) +static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; @@ -2196,8 +2195,9 @@ static void shader_glsl_arith(const struct wined3d_shader_instruction *ins) /* Determine the GLSL operator to use based on the opcode */ switch (ins->handler_idx) { - case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_ADD: op = '+'; break; + case WINED3DSIH_AND: op = '&'; break; + case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: op = ' '; @@ -5126,8 +5126,8 @@ static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = { /* WINED3DSIH_ABS */ shader_glsl_map2gl, - /* WINED3DSIH_ADD */ shader_glsl_arith, - /* WINED3DSIH_AND */ NULL, + /* WINED3DSIH_ADD */ shader_glsl_binop, + /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, @@ -5190,7 +5190,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOV */ shader_glsl_mov, /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ NULL, - /* WINED3DSIH_MUL */ shader_glsl_arith, + /* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, @@ -5209,7 +5209,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ NULL, - /* WINED3DSIH_SUB */ shader_glsl_arith, + /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem,

1 0

Henri Verbeet : wined3d: wined3d_stateblock_apply() never fails.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 8e24dbb60a95b731013044d6e084272b642e9e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e24dbb60a95b731013044d6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:17 2012 +0200 wined3d: wined3d_stateblock_apply() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/stateblock.c | 5 ++--- dlls/ddraw/ddraw.c | 8 +------- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/stateblock.c | 4 +--- include/wine/wined3d.h | 2 +- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a8af52e..a7d5267 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1532,7 +1532,6 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr; TRACE("iface %p, token %#x.\n", iface, token); @@ -1547,10 +1546,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - hr = wined3d_stateblock_apply(stateblock); + wined3d_stateblock_apply(stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 4af2247..5eea835 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -108,15 +108,14 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_apply(stateblock->wined3d_stateblock); + wined3d_stateblock_apply(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c2a7be1..f34888d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -955,14 +955,8 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, wined3d_surface_decref(rt); } - hr = wined3d_stateblock_apply(stateblock); + wined3d_stateblock_apply(stateblock); wined3d_stateblock_decref(stateblock); - if (FAILED(hr)) - { - ERR("Failed to apply stateblock, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } } /* Unhandled flags */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a0b6781..ba7d011 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5380,7 +5380,6 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_stateblock *wined3d_sb; - HRESULT hr; TRACE("iface %p, stateblock %#x.\n", iface, stateblock); @@ -5393,10 +5392,10 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb return D3DERR_INVALIDSTATEBLOCK; } - hr = wined3d_stateblock_apply(wined3d_sb); + wined3d_stateblock_apply(wined3d_sb); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_ApplyStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a2524f1..c399bad 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -917,7 +917,7 @@ static void apply_lights(struct wined3d_device *device, const struct wined3d_sta } } -HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) { struct wined3d_device *device = stateblock->device; unsigned int i; @@ -1072,8 +1072,6 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo } TRACE("Applied stateblock %p.\n", stateblock); - - return WINED3D_OK; } void stateblock_init_default_state(struct wined3d_stateblock *stateblock) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb44969..42b21e6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2304,7 +2304,7 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader); HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader, UINT start_idx, const float *src_data, UINT vector4f_count); -HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock);

1 0

Henri Verbeet : wined3d: wined3d_stateblock_capture() never fails.
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: b69545c7da86e98ef1191e9a9fdaa5712d13ba8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69545c7da86e98ef1191e9a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:16 2012 +0200 wined3d: wined3d_stateblock_capture() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/stateblock.c | 5 ++--- dlls/ddraw/ddraw.c | 9 +-------- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/stateblock.c | 4 +--- include/wine/wined3d.h | 2 +- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6b33684..a8af52e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1557,7 +1557,6 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr; TRACE("iface %p, token %#x.\n", iface, token); @@ -1569,10 +1568,10 @@ static HRESULT WINAPI d3d8_device_CaptureStateBlock(IDirect3DDevice8 *iface, DWO wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - hr = wined3d_stateblock_capture(stateblock); + wined3d_stateblock_capture(stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_DeleteStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8ec8db9..4af2247 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -95,15 +95,14 @@ static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDi static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_capture(stateblock->wined3d_stateblock); + wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e7d9302..c2a7be1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -924,14 +924,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return hr; } - if (FAILED(hr = wined3d_stateblock_capture(stateblock))) - { - ERR("Failed to capture stateblock, hr %#x.\n", hr); - wined3d_stateblock_decref(stateblock); - wined3d_mutex_unlock(); - return hr; - } - + wined3d_stateblock_capture(stateblock); rt = wined3d_device_get_render_target(This->wined3d_device, 0); if (rt == This->wined3d_frontbuffer) rt = NULL; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3e86c35..a0b6781 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5436,7 +5436,6 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_stateblock *wined3d_sb; - HRESULT hr; TRACE("iface %p, stateblock %#x.\n", iface, stateblock); @@ -5449,10 +5448,10 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat return D3DERR_INVALIDSTATEBLOCK; } - hr = wined3d_stateblock_capture(wined3d_sb); + wined3d_stateblock_capture(wined3d_sb); wined3d_mutex_unlock(); - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_CaptureStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e357095..a2524f1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -611,7 +611,7 @@ static void wined3d_state_record_lights(struct wined3d_state *dst_state, const s } } -HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { const struct wined3d_state *src_state = &stateblock->device->stateBlock->state; unsigned int i; @@ -897,8 +897,6 @@ HRESULT CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) wined3d_state_record_lights(&stateblock->state, src_state); TRACE("Capture done.\n"); - - return WINED3D_OK; } static void apply_lights(struct wined3d_device *device, const struct wined3d_state *state) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 521b2b3..bb44969 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2305,7 +2305,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * UINT start_idx, const float *src_data, UINT vector4f_count); HRESULT __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); -HRESULT __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock);

1 0

Henri Verbeet : d3d10: Handle depth stencil state in d3d10_effect_object_apply().
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: b2228834c7b8ddc5a43ed95deb39e0a0ede36ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2228834c7b8ddc5a43ed95de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:15 2012 +0200 d3d10: Handle depth stencil state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 314faf8..fc9cb41 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -75,6 +75,7 @@ struct d3d10_effect_object union { ID3D10RasterizerState *rs; + ID3D10DepthStencilState *ds; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 662bfce..4b26562 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1347,6 +1347,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } + case D3D10_EOT_DEPTH_STENCIL_STATE: + { + ID3D10EffectDepthStencilVariable *dv = variable->lpVtbl->AsDepthStencil(variable); + if (FAILED(hr = dv->lpVtbl->GetDepthStencilState(dv, variable_idx, &o->object.ds))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1377,7 +1385,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_DEPTH_STENCIL_STATE: case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: case D3D10_EOT_BLEND_FACTOR: @@ -2170,6 +2177,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_RSSetState(device, o->object.rs); return S_OK; + case D3D10_EOT_DEPTH_STENCIL_STATE: + ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2182,6 +2193,9 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) ID3D10Device_GSSetShader(device, o->object.gs); return S_OK; + case D3D10_EOT_STENCIL_REF: + return S_OK; + default: FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; @@ -2274,6 +2288,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) ID3D10RasterizerState_Release(o->object.rs); break; + case D3D10_EOT_DEPTH_STENCIL_STATE: + if (o->object.ds) + ID3D10DepthStencilState_Release(o->object.ds); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs);

1 0

Henri Verbeet : d3d10: Handle rasterizer state in d3d10_effect_object_apply ().
by Alexandre Julliard 08 Oct '12

08 Oct '12

Module: wine Branch: master Commit: 16c6e4e332d13a53c2dae0f2cc11922e0c728862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c6e4e332d13a53c2dae0f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 23:42:14 2012 +0200 d3d10: Handle rasterizer state in d3d10_effect_object_apply(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 686ff68..314faf8 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -74,6 +74,7 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { + ID3D10RasterizerState *rs; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1dbc634..662bfce 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1339,6 +1339,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr switch (o->type) { + case D3D10_EOT_RASTERIZER_STATE: + { + ID3D10EffectRasterizerVariable *rv = variable->lpVtbl->AsRasterizer(variable); + if (FAILED(hr = rv->lpVtbl->GetRasterizerState(rv, variable_idx, &o->object.rs))) + return hr; + break; + } + case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); @@ -1369,7 +1377,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr break; } - case D3D10_EOT_RASTERIZER_STATE: case D3D10_EOT_DEPTH_STENCIL_STATE: case D3D10_EOT_BLEND_STATE: case D3D10_EOT_STENCIL_REF: @@ -2159,6 +2166,10 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) switch(o->type) { + case D3D10_EOT_RASTERIZER_STATE: + ID3D10Device_RSSetState(device, o->object.rs); + return S_OK; + case D3D10_EOT_VERTEXSHADER: ID3D10Device_VSSetShader(device, o->object.vs); return S_OK; @@ -2258,6 +2269,11 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) { switch (o->type) { + case D3D10_EOT_RASTERIZER_STATE: + if (o->object.rs) + ID3D10RasterizerState_Release(o->object.rs); + break; + case D3D10_EOT_VERTEXSHADER: if (o->object.vs) ID3D10VertexShader_Release(o->object.vs);

1 0

← Newer
1
...
74
75
76
77
78
79
80
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012