wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Austin English : comdlg32/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 5c9d341c693d57feb1e1807586381c6403e17c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9d341c693d57feb1e180758… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:29:32 2011 -0800 comdlg32/tests: Remove win9x hacks. --- dlls/comdlg32/tests/filedlg.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 73e8d36..7f5d175 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -142,9 +142,7 @@ static void test_DialogCancel(void) else { ok(0 == result, "expected 0, got %d\n", result); - ok(0 == CommDlgExtendedError() || - broken(CDERR_INITIALIZATION == CommDlgExtendedError()), /* win9x */ - "expected 0, got %d\n", CommDlgExtendedError()); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } SetLastError(0xdeadbeef); @@ -154,9 +152,7 @@ static void test_DialogCancel(void) else { ok(0 == result, "expected 0, got %d\n", result); - ok(0 == CommDlgExtendedError() || - broken(CDERR_INITIALIZATION == CommDlgExtendedError()), /* win9x */ - "expected 0, got %d\n", CommDlgExtendedError()); + ok(0 == CommDlgExtendedError(), "expected 0, got %d\n", CommDlgExtendedError()); } } @@ -219,7 +215,7 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_DestroyViewWindow(shell_view2); ok(SUCCEEDED(hr), "DestroyViewWindow returned %#x\n", hr); - /* XP and W2K3 need this. On Win9x and W2K the call to DestroyWindow() fails and has + /* XP and W2K3 need this. On W2K the call to DestroyWindow() fails and has * no side effects. NT4 doesn't get here. (FIXME: Vista doesn't get here yet). */ DestroyWindow(view_params.hwndView); @@ -231,9 +227,7 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); - ok(folder_settings.ViewMode == FVM_DETAILS || - broken(folder_settings.ViewMode == FVM_LIST), /* Win9x */ - "view mode is %d, expected FVM_DETAILS\n", + ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected FVM_DETAILS\n", folder_settings.ViewMode); cleanup: @@ -433,8 +427,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L /* sized horizontal and moved vertical */ case cmb1: case edt1: - ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0) || - broken(TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0)),/*win98*/ + ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0), "control id %03x should have sized horizontally and moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlrcs[i].right, ctrlrcs[i].bottom, @@ -451,8 +444,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L /* moved horizontal and vertical */ case IDCANCEL: case pshHelp: - ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0) || - broken(TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0)),/*win98*/ + ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0), "control id %03x should have moved horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlrcs[i].right, ctrlrcs[i].bottom,

1 0

Austin English : advpack/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: befe57aa14782f8210fcbbe89d9e8b371a1777dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=befe57aa14782f8210fcbbe89… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:28:33 2011 -0800 advpack/tests: Remove win9x hacks. --- dlls/advpack/tests/install.c | 28 +++++++--------------------- 1 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 3b0954f..91bef81 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -109,9 +109,7 @@ static void test_RunSetupCommand(void) /* try to run an exe with the RSC_FLAG_INF flag */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", systemdir, "Title", &hexe, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(is_spapi_err(hr) || - hr == E_FAIL, /* win9x */ - "Expected a setupapi error or E_FAIL, got %d\n", hr); + ok(is_spapi_err(hr), "Expected a setupapi error, got %d\n", hr); ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); @@ -144,9 +142,7 @@ static void test_RunSetupCommand(void) /* try a relative path to the INF, with working dir provided */ hr = pRunSetupCommand(NULL, "one\\test.inf", "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == ERROR_SUCCESS || - hr == E_FAIL, /* win9x */ - "Expected ERROR_SUCCESS, got %d\n", hr); + ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr); /* try a relative path to the INF, NULL working dir */ hr = pRunSetupCommand(NULL, "one\\test.inf", "DefaultInstall", NULL, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); @@ -155,15 +151,11 @@ static void test_RunSetupCommand(void) /* try a relative path to the INF, empty working dir */ hr = pRunSetupCommand(NULL, "one\\test.inf", "DefaultInstall", "", "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == ERROR_SUCCESS || - hr == E_FAIL, /* win9x */ - "Expected ERROR_SUCCESS or E_FAIL, got %d\n", hr); + ok(hr == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", hr); /* try only the INF filename, with working dir provided */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", dir, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); /* try only the INF filename, NULL working dir */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", NULL, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); @@ -172,9 +164,7 @@ static void test_RunSetupCommand(void) /* try only the INF filename, empty working dir */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", "", "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); DeleteFileA("one\\test.inf"); RemoveDirectoryA("one"); @@ -183,9 +173,7 @@ static void test_RunSetupCommand(void) /* try INF file in the current directory, working directory provided */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", CURR_DIR, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); /* try INF file in the current directory, NULL working directory */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", NULL, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); @@ -194,9 +182,7 @@ static void test_RunSetupCommand(void) /* try INF file in the current directory, empty working directory */ hr = pRunSetupCommand(NULL, "test.inf", "DefaultInstall", CURR_DIR, "Title", NULL, RSC_FLAG_INF | RSC_FLAG_QUIET, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hr == E_FAIL, /* win9x */ - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) or E_FAIL, got %d\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); } static void test_LaunchINFSection(void)

1 0

Austin English : advapi32/tests: Remove Win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 4bf211714e5ae15d05d91e8ab35c016bf8218a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf211714e5ae15d05d91e8ab… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:27:58 2011 -0800 advapi32/tests: Remove Win9x hacks. --- dlls/advapi32/tests/security.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bfe9783..4ba244f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1881,12 +1881,6 @@ static void test_LookupAccountName(void) user_size = UNLEN + 1; SetLastError(0xdeadbeef); ret = GetUserNameA(user_name, &user_size); - if (!ret && (GetLastError() == ERROR_NOT_LOGGED_ON)) - { - /* Probably on win9x where the user used 'Cancel' instead of properly logging in */ - skip("Cannot get the user name (win9x and not logged in properly)\n"); - return; - } ok(ret, "Failed to get user name : %d\n", GetLastError()); /* get sizes */

1 0

Rico Schüller : d3dcompiler/tests: Improve test_reflection_bound_resources().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: f9d4a45fbb667f8db9ee34ab0d4dcf019e3a10e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d4a45fbb667f8db9ee34ab0… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:51:01 2011 +0100 d3dcompiler/tests: Improve test_reflection_bound_resources(). --- dlls/d3dcompiler_43/tests/reflection.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 76249f7..7d53f7a 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1018,22 +1018,22 @@ static void test_reflection_bound_resources(void) /* check invalid cases */ hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0, NULL); - ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDesc(ref11, 0xffffffff, &desc); - ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDesc failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, NULL, &desc); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "sam", NULL); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", NULL); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); hr = ref11->lpVtbl->GetResourceBindingDescByName(ref11, "invalid", &desc); - ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed %x\n", hr); + ok(hr == E_INVALIDARG, "GetResourceBindingDescByName failed, got %x, expected %x\n", hr, E_INVALIDARG); /* GetResourceBindingDesc */ for (i = 0; i < sizeof(test_reflection_bound_resources_result)/sizeof(*test_reflection_bound_resources_result); ++i)

1 0

Rico Schüller : d3dcompiler/tests: Add constant buffer test.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: a0abef6b457bd5e120ce488ff4f170474cf6e932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0abef6b457bd5e120ce488ff… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:51:05 2011 +0100 d3dcompiler/tests: Add constant buffer test. --- dlls/d3dcompiler_43/tests/reflection.c | 336 ++++++++++++++++++++++++++++++++ 1 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0abef6b457bd5e120ce4…

1 0

Rico Schüller : d3dcompiler: Reorder section parsing to reflect the order from the shader blob.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3c1ffbf2e7f440b3d15615f1932e29b43743d24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1ffbf2e7f440b3d15615f19… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:50:58 2011 +0100 d3dcompiler: Reorder section parsing to reflect the order from the shader blob. --- dlls/d3dcompiler_43/reflection.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 120eff0..157e791 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1465,25 +1465,6 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection switch (section->tag) { - case TAG_STAT: - hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); - if (FAILED(hr)) - { - WARN("Failed to parse section STAT.\n"); - goto err_out; - } - break; - - case TAG_SHEX: - case TAG_SHDR: - hr = d3dcompiler_parse_shdr(reflection, section->data, section->data_size); - if (FAILED(hr)) - { - WARN("Failed to parse SHDR section.\n"); - goto err_out; - } - break; - case TAG_RDEF: hr = d3dcompiler_parse_rdef(reflection, section->data, section->data_size); if (FAILED(hr)) @@ -1545,6 +1526,25 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_SHEX: + case TAG_SHDR: + hr = d3dcompiler_parse_shdr(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse SHDR section.\n"); + goto err_out; + } + break; + + case TAG_STAT: + hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse section STAT.\n"); + goto err_out; + } + break; + default: FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); break;

1 0

Rico Schüller : d3dcompiler/tests: Add reflection ps output desc test.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3850e8f4e3cea5aab0a8b5f092afffeaf84885cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3850e8f4e3cea5aab0a8b5f09… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:50:55 2011 +0100 d3dcompiler/tests: Add reflection ps output desc test. --- dlls/d3dcompiler_43/tests/reflection.c | 222 ++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3850e8f4e3cea5aab0a8b…

1 0

Rico Schüller : d3dcompiler: Fix SystemValueType for pixelshader output signature.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3f04448dbbe5d096e44847a788981544dd504ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f04448dbbe5d096e44847a78… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:50:52 2011 +0100 d3dcompiler: Fix SystemValueType for pixelshader output signature. --- dlls/d3dcompiler_43/reflection.c | 26 ++++++++++++++++++++++---- dlls/d3dcompiler_43/tests/reflection.c | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 9119a83..120eff0 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1315,7 +1315,7 @@ err_out: return hr; } -HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section) +static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section, DWORD target) { D3D11_SIGNATURE_PARAMETER_DESC *d; unsigned int string_data_offset; @@ -1393,6 +1393,24 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, stru d[i].ReadWriteMask = (mask >> 8) & 0xff; d[i].Mask = mask & 0xff; + /* pixel shaders have a special handling for SystemValueType in the output signature */ + if (((target & 0xffff0000) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) + { + TRACE("Pixelshader output signature fixup.\n"); + + if (d[i].Register == 0xffffffff) + { + if (!strcasecmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; + if (!strcasecmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; + if (!strcasecmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; + if (!strcasecmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; + } + else + { + d[i].SystemValueType = D3D_NAME_TARGET; + } + } + TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x, stream %u\n", debugstr_a(d[i].SemanticName), d[i].SemanticIndex, d[i].SystemValueType, @@ -1484,7 +1502,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->isgn, section); + hr = d3dcompiler_parse_signature(reflection->isgn, section, reflection->target); if (FAILED(hr)) { WARN("Failed to parse section ISGN.\n"); @@ -1502,7 +1520,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->osgn, section); + hr = d3dcompiler_parse_signature(reflection->osgn, section, reflection->target); if (FAILED(hr)) { WARN("Failed to parse section OSGN.\n"); @@ -1519,7 +1537,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->pcsg, section); + hr = d3dcompiler_parse_signature(reflection->pcsg, section, reflection->target); if (FAILED(hr)) { WARN("Failed to parse section PCSG.\n"); diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fdfbf1b..98b8c0c 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -694,7 +694,7 @@ static void test_reflection_desc_ps(void) i, desc.SemanticIndex, pdesc->SemanticIndex); ok(desc.Register == pdesc->Register, "GetOutputParameterDesc(%u) Register failed, got %u, expected %u\n", i, desc.Register, pdesc->Register); - todo_wine ok(desc.SystemValueType == pdesc->SystemValueType, "GetOutputParameterDesc(%u) SystemValueType failed, got %x, expected %x\n", + ok(desc.SystemValueType == pdesc->SystemValueType, "GetOutputParameterDesc(%u) SystemValueType failed, got %x, expected %x\n", i, desc.SystemValueType, pdesc->SystemValueType); ok(desc.ComponentType == pdesc->ComponentType, "GetOutputParameterDesc(%u) ComponentType failed, got %x, expected %x\n", i, desc.ComponentType, pdesc->ComponentType);

1 0

Henri Verbeet : wined3d: Remove IWineD3DResource::UnLoad() from the public interface.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 39497ff4d19d5312fcc968a5166195450b6dddd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39497ff4d19d5312fcc968a51… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:39 2011 +0100 wined3d: Remove IWineD3DResource::UnLoad() from the public interface. --- dlls/wined3d/basetexture.c | 4 +- dlls/wined3d/buffer.c | 28 +++--- dlls/wined3d/cubetexture.c | 54 ++++++------ dlls/wined3d/device.c | 4 +- dlls/wined3d/resource.c | 4 +- dlls/wined3d/surface.c | 203 +++++++++++++++++++++------------------- dlls/wined3d/surface_gdi.c | 15 --- dlls/wined3d/texture.c | 49 +++++----- dlls/wined3d/volume.c | 31 ++++--- dlls/wined3d/volumetexture.c | 43 +++++---- dlls/wined3d/wined3d_private.h | 14 ++- include/wine/wined3d.idl | 2 - 12 files changed, 231 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39497ff4d19d5312fcc96…

1 0

Henri Verbeet : wined3d: Merge device_unload_resource() and reset_unload_resources().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 1da773ff4d102a512ce3ab3fedf7cb830216e384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da773ff4d102a512ce3ab3fe… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:38 2011 +0100 wined3d: Merge device_unload_resource() and reset_unload_resources(). --- dlls/wined3d/device.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e2e4b86..365225b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2102,11 +2102,14 @@ err_out: return hr; } -static HRESULT WINAPI device_unload_resource(IWineD3DResource *resource, void *ctx) +static HRESULT WINAPI device_unload_resource(IWineD3DResource *resource, void *data) { + TRACE("Unloading resource %p.\n", resource); + IWineD3DResource_UnLoad(resource); IWineD3DResource_Release(resource); - return WINED3D_OK; + + return S_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, @@ -6180,13 +6183,6 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES return WINED3D_OK; } -static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) { - TRACE("Unloading resource %p\n", resource); - IWineD3DResource_UnLoad(resource); - IWineD3DResource_Release(resource); - return S_OK; -} - static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRESENT_PARAMETERS *pp) { UINT i, count; @@ -6223,7 +6219,7 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain context = context_acquire(device, NULL); gl_info = context->gl_info; - IWineD3DDevice_EnumResources((IWineD3DDevice *)device, reset_unload_resources, NULL); + IWineD3DDevice_EnumResources((IWineD3DDevice *)device, device_unload_resource, NULL); LIST_FOR_EACH_ENTRY(shader, &device->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { device->shader_backend->shader_destroy(shader);

1 0

← Newer
1
2
3
4
5
6
7
8
...
68
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 February 2011