February 2011 - Wine-Commits

Austin English : cryptnet/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: de6e33f306a3b1b424ad1a9c41e85d3692ef9e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6e33f306a3b1b424ad1a9c4… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:30:25 2011 -0800 cryptnet/tests: Remove win9x hacks. --- dlls/cryptnet/tests/cryptnet.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 113406c..a7fc9ec 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -365,12 +365,9 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, 95: OSS_DATA_ERROR */ - ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), - "got 0x%x/%u (expected CRYPT_E_NO_MATCH or CRYPT_E_ASN1_BADTAG or " - "OSS_DATA_ERROR)\n", GetLastError(), GetLastError()); + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH */ + ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH), + "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ if(!ret && GetLastError() != CRYPT_E_ASN1_BADTAG && @@ -408,9 +405,8 @@ static void test_retrieveObjectByUrl(void) cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success, 9x: fail with E_INVALIDARG */ - ok(ret || (GetLastError() == E_INVALIDARG), - "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + /* w2k: success */ + ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); @@ -419,9 +415,8 @@ static void test_retrieveObjectByUrl(void) aux.cbSize = sizeof(aux); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success, 9x: fail with E_INVALIDARG */ - ok(ret || (GetLastError() == E_INVALIDARG), - "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + /* w2k: success */ + ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (!ret) { /* no more tests useful */

1 0

Austin English : advapi32/tests: Remove Win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

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

Austin English : advpack/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

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 : comdlg32/tests: Remove win9x hacks.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

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

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

Feb. 28, 2011

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

Henri Verbeet : wined3d: Filter sRGB capabilities during format initialization.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: d9d2fe31e324dc25ea5b442aeba661715fae9a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d2fe31e324dc25ea5b442ae… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:36 2011 +0100 wined3d: Filter sRGB capabilities during format initialization. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/volumetexture.c | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 899011e..d80df10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3159,7 +3159,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { - return adapter->gl_info.supported[EXT_TEXTURE_SRGB] && (format->flags & WINED3DFMT_FLAG_SRGB_READ); + return format->flags & WINED3DFMT_FLAG_SRGB_READ; } static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 220e5fe..4c91644 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1197,6 +1197,14 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) format->flags |= format_texture_info[i].flags; format->heightscale = 1.0f; + /* Filter sRGB capabilities if EXT_texture_sRGB is not supported. */ + if (!gl_info->supported[EXT_TEXTURE_SRGB] + && format->glGammaInternal != format->glInternal) + { + format->glGammaInternal = format->glInternal; + format->flags &= ~(WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + } + /* Texture conversion stuff */ format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7da1cf1..37c51bb 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -40,7 +40,6 @@ static HRESULT volumetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb) static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB srgb) { IWineD3DDeviceImpl *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context = NULL; BOOL srgb_mode = texture->baseTexture.is_srgb; BOOL srgb_was_toggled = FALSE; @@ -49,7 +48,7 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D TRACE("texture %p, srgb %#x.\n", texture, srgb); if (!device->isInDraw) context = context_acquire(device, NULL); - else if (gl_info->supported[EXT_TEXTURE_SRGB] && texture->baseTexture.bindCount > 0) + else if (texture->baseTexture.bindCount > 0) { srgb_mode = device->stateBlock->state.sampler_states[texture->baseTexture.sampler][WINED3DSAMP_SRGBTEXTURE]; srgb_was_toggled = texture->baseTexture.is_srgb != srgb_mode;

1 0

Henri Verbeet : wined3d: Recognize some Northern Islands cards in select_card_ati_mesa().
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 14050e125de3895dd9a0afba0af96d5bae143e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14050e125de3895dd9a0afba0… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:37 2011 +0100 wined3d: Recognize some Northern Islands cards in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d80df10..3288989 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1090,6 +1090,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, 1024}, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6310, "AMD Radeon HD 6310 Graphics", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_ATI_R600, 2048}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1727,6 +1730,10 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info } cards[] = { + /* Northern Islands */ + {"CAYMAN", CARD_ATI_RADEON_HD6900}, + {"BARTS", CARD_ATI_RADEON_HD6800}, + {"PALM", CARD_ATI_RADEON_HD6310}, /* Evergreen */ {"HEMLOCK", CARD_ATI_RADEON_HD5900}, {"CYPRESS", CARD_ATI_RADEON_HD5800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a262cca..455fb1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1359,6 +1359,9 @@ enum wined3d_pci_device CARD_ATI_RADEON_HD5850 = 0x6898, CARD_ATI_RADEON_HD5870 = 0x6899, CARD_ATI_RADEON_HD5900 = 0x689c, + CARD_ATI_RADEON_HD6310 = 0x9803, + CARD_ATI_RADEON_HD6800 = 0x6739, + CARD_ATI_RADEON_HD6900 = 0x6719, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

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

Feb. 28, 2011

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

Marcus Meissner : kernel32: Avoid shadowing "status" variable.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: a91b65960f4b65273cf14fd355c3cf424762814c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91b65960f4b65273cf14fd35… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 25 17:20:51 2011 +0100 kernel32: Avoid shadowing "status" variable. --- dlls/kernel32/volume.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 106b4fb..912f215 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1103,7 +1103,6 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } else { - NTSTATUS status; WCHAR *buffer; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) )))

1 0

Nikolay Sivov : msxml3/tests: Remove broken test and parameter check.
by Alexandre Julliard Feb. 28, 2011

Feb. 28, 2011

Module: wine Branch: master Commit: 4e5075bcc46e5a1081fd2c9128f46672cc517f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5075bcc46e5a1081fd2c912… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 27 23:38:30 2011 +0300 msxml3/tests: Remove broken test and parameter check. --- dlls/msxml3/nodelist.c | 3 --- dlls/msxml3/tests/domdoc.c | 6 ------ 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 53cf5f5..749b179 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -71,9 +71,6 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - if(!ppvObject) - return E_INVALIDARG; - if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6aad135..abd1f4b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1942,9 +1942,6 @@ todo_wine if (list) { - r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG || r == E_POINTER, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_item(list, 0, NULL); ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); @@ -2738,9 +2735,6 @@ static void test_get_text(void) IXMLDOMNode_Release(nodeRoot); } - r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, NULL ); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0