April 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8/tests: Use a separate device for depth_clamp_test().
by Alexandre Julliard April 22, 2014

April 22, 2014

Module: wine Branch: master Commit: 25d2de7b935b608205581066afff368d04c10c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d2de7b935b608205581066a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 22 09:02:12 2014 +0200 d3d8/tests: Use a separate device for depth_clamp_test(). --- dlls/d3d8/tests/visual.c | 53 +++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 482e7ec..56fa0ca 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2606,44 +2606,53 @@ done: * clipped when D3DPMISCCAPS_CLIPTLVERTS is set, clamped when it isn't. * - The viewport's MinZ/MaxZ is irrelevant for this. */ -static void depth_clamp_test(IDirect3DDevice8 *device) +static void depth_clamp_test(void) { - const struct tvertex quad1[] = + IDirect3DDevice8 *device; + D3DVIEWPORT8 vp; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const struct tvertex quad1[] = { { 0.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, {640.0f, 0.0f, 5.0f, 1.0f, 0xff002b7f}, { 0.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, {640.0f, 480.0f, 5.0f, 1.0f, 0xff002b7f}, }; - const struct tvertex quad2[] = + static const struct tvertex quad2[] = { { 0.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, {640.0f, 300.0f, 10.0f, 1.0f, 0xfff9e814}, { 0.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, {640.0f, 360.0f, 10.0f, 1.0f, 0xfff9e814}, }; - const struct tvertex quad3[] = + static const struct tvertex quad3[] = { {112.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, {208.0f, 108.0f, 5.0f, 1.0f, 0xffffffff}, {112.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, {208.0f, 204.0f, 5.0f, 1.0f, 0xffffffff}, }; - const struct tvertex quad4[] = + static const struct tvertex quad4[] = { { 42.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 41.0f, 10.0f, 1.0f, 0xffffffff}, { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; - const struct vertex quad5[] = + static const struct vertex quad5[] = { { -0.5f, 0.5f, 10.0f, 0xff14f914}, { 0.5f, 0.5f, 10.0f, 0xff14f914}, { -0.5f, -0.5f, 10.0f, 0xff14f914}, { 0.5f, -0.5f, 10.0f, 0xff14f914}, }; - const struct vertex quad6[] = + static const struct vertex quad6[] = { { -1.0f, 0.5f, 10.0f, 0xfff91414}, { 1.0f, 0.5f, 10.0f, 0xfff91414}, @@ -2651,10 +2660,18 @@ static void depth_clamp_test(IDirect3DDevice8 *device) { 1.0f, 0.25f, 10.0f, 0xfff91414}, }; - D3DVIEWPORT8 vp; - D3DCOLOR color; - D3DCAPS8 caps; - HRESULT hr; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); vp.X = 0; vp.Y = 0; @@ -2663,9 +2680,6 @@ static void depth_clamp_test(IDirect3DDevice8 *device) vp.MinZ = 0.0; vp.MaxZ = 7.5; - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetViewport(device, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); @@ -2747,10 +2761,11 @@ static void depth_clamp_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); - vp.MinZ = 0.0; - vp.MaxZ = 1.0; - hr = IDirect3DDevice8_SetViewport(device, &vp); - ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void depth_buffer_test(void) @@ -5014,7 +5029,6 @@ START_TEST(visual) } test_sanity(device_ptr); - depth_clamp_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -5022,6 +5036,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + depth_clamp_test(); lighting_test(); clear_test(); fog_test();

1 0

Henri Verbeet : wined3d: Ignore invalid PCI vendor/device overrides.
by Alexandre Julliard April 22, 2014

April 22, 2014

Module: wine Branch: master Commit: 36d8d6bf8ed66f398ff03dde894d75b91cff671c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d8d6bf8ed66f398ff03dde8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 22 09:02:16 2014 +0200 wined3d: Ignore invalid PCI vendor/device overrides. --- dlls/wined3d/directx.c | 78 +++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4be7ea5..649b986 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) #define DEFAULT_REFRESH_RATE 0 @@ -1367,33 +1368,56 @@ static const struct driver_version_information *get_driver_version_info(enum win return NULL; } +static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor vendor, + enum wined3d_pci_device device) +{ + unsigned int i; + + for (i = 0; i < (sizeof(gpu_description_table) / sizeof(*gpu_description_table)); ++i) + { + if (vendor == gpu_description_table[i].vendor && device == gpu_description_table[i].card) + return &gpu_description_table[i]; + } + + return NULL; +} + static void init_driver_info(struct wined3d_driver_info *driver_info, enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) { OSVERSIONINFOW os_version; WORD driver_os_version; - unsigned int i; - enum wined3d_display_driver driver = DRIVER_UNKNOWN; + enum wined3d_display_driver driver; enum wined3d_driver_model driver_model; const struct driver_version_information *version_info; + const struct gpu_description *gpu_desc; - if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) + if (driver_info->vendor != PCI_VENDOR_NONE || driver_info->device != PCI_DEVICE_NONE) { - TRACE("Overriding PCI vendor ID with 0x%04x.\n", wined3d_settings.pci_vendor_id); - vendor = wined3d_settings.pci_vendor_id; - } - driver_info->vendor = vendor; + static unsigned int once; - if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) - { - TRACE("Overriding PCI device ID with 0x%04x.\n", wined3d_settings.pci_device_id); - device = wined3d_settings.pci_device_id; + TRACE("GPU override %04x:%04x.\n", wined3d_settings.pci_vendor_id, wined3d_settings.pci_device_id); + + driver_info->vendor = wined3d_settings.pci_vendor_id; + if (driver_info->vendor == PCI_VENDOR_NONE) + driver_info->vendor = vendor; + + driver_info->device = wined3d_settings.pci_device_id; + if (driver_info->device == PCI_DEVICE_NONE) + driver_info->device = device; + + if (get_gpu_description(driver_info->vendor, driver_info->device)) + { + vendor = driver_info->vendor; + device = driver_info->device; + } + else if (!once++) + ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", + driver_info->vendor, driver_info->device); } - driver_info->device = device; - /* Set a default amount of video memory (64 MB). In general this code isn't used unless the user - * overrides the pci ids to a card which is not in our database. */ - driver_info->vidmem = WINE_DEFAULT_VIDMEM; + driver_info->vendor = vendor; + driver_info->device = device; memset(&os_version, 0, sizeof(os_version)); os_version.dwOSVersionInfoSize = sizeof(os_version); @@ -1453,19 +1477,18 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } } - /* When we reach this stage we always have a vendor or device id (it can be a default one). - * This means that unless the ids are overridden, we will always find a GPU description. */ - for (i = 0; i < (sizeof(gpu_description_table) / sizeof(gpu_description_table[0])); i++) + if ((gpu_desc = get_gpu_description(driver_info->vendor, driver_info->device))) { - if (vendor == gpu_description_table[i].vendor && device == gpu_description_table[i].card) - { - TRACE("Found card %04x:%04x in driver DB.\n", vendor, device); - - driver_info->description = gpu_description_table[i].description; - driver_info->vidmem = gpu_description_table[i].vidmem * 1024*1024; - driver = gpu_description_table[i].driver; - break; - } + driver_info->description = gpu_desc->description; + driver_info->vidmem = gpu_desc->vidmem * 1024 * 1024; + driver = gpu_desc->driver; + } + else + { + ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); + driver_info->description = "Direct3D HAL"; + driver_info->vidmem = WINE_DEFAULT_VIDMEM; + driver = DRIVER_UNKNOWN; } if (wined3d_settings.emulated_textureram) @@ -1505,7 +1528,6 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } else { - driver_info->description = "Direct3D HAL"; driver_info->name = "Display"; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */

1 0

Qian Hong : include: Added some ATL function prototypes.
by Alexandre Julliard April 22, 2014

April 22, 2014

Module: wine Branch: master Commit: 43cd9e6d969b8b2eecc522a8251d3cc7cf40a922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43cd9e6d969b8b2eecc522a82… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Apr 22 16:38:44 2014 +0800 include: Added some ATL function prototypes. --- include/atliface.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/atliface.idl b/include/atliface.idl index ce47f10..e7599c7 100644 --- a/include/atliface.idl +++ b/include/atliface.idl @@ -207,8 +207,15 @@ cpp_quote("DEFINE_GUID(CLSID_Registrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0 cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);") cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);") +cpp_quote("HRESULT WINAPI AtlAxCreateControlLic(LPCOLESTR,HWND,IStream*,IUnknown**,BSTR);") +cpp_quote("HRESULT WINAPI AtlAxCreateControlLicEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*,BSTR);") cpp_quote("BOOL WINAPI AtlAxWinInit(void);") +cpp_quote("HRESULT WINAPI AtlAxGetControl(HWND,IUnknown**);") +cpp_quote("HRESULT WINAPI AtlAxGetHost(HWND,IUnknown**);") cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog)") +cpp_quote("INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("#define AtlAxDialogBox WINELIB_NAME_AW(AtlAxDialogBox)")

1 0

Henri Verbeet : d3d8/tests: Use a separate device for test_sanity().
by Alexandre Julliard April 22, 2014

April 22, 2014

Module: wine Branch: master Commit: a8248847f5863bef1f830f5cb9a3377afeb50f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8248847f5863bef1f830f5cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 22 09:02:13 2014 +0200 d3d8/tests: Use a separate device for test_sanity(). --- dlls/d3d8/tests/visual.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 56fa0ca..41486c0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -152,11 +152,25 @@ struct nvertex DWORD diffuse; }; -static void test_sanity(IDirect3DDevice8 *device) +static void test_sanity(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); color = getPixelColor(device, 1, 1); @@ -172,6 +186,12 @@ static void test_sanity(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void lighting_test(void) @@ -4997,10 +5017,7 @@ done: START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; - IDirect3DDevice8 *device_ptr; IDirect3D8 *d3d; - ULONG refcount; - HWND window; HRESULT hr; if (!(d3d = Direct3DCreate8(D3D_SDK_VERSION))) @@ -5020,22 +5037,9 @@ START_TEST(visual) HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); - window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 0, 0, 640, 480, NULL, NULL, NULL, NULL); - if (!(device_ptr = create_device(d3d, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - goto cleanup; - } - - test_sanity(device_ptr); - - refcount = IDirect3DDevice8_Release(device_ptr); - ok(!refcount, "Device has %u references left.\n", refcount); -cleanup: IDirect3D8_Release(d3d); - DestroyWindow(window); + test_sanity(); depth_clamp_test(); lighting_test(); clear_test();

1 0

Andrew Sheldon : wined3d: Add NVIDIA Geforce GTX 780 to supported device list.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 5ef54904f24c7dfc4a0bfd1795e59cf510c425d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef54904f24c7dfc4a0bfd179… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Sat Apr 19 16:28:36 2014 +1000 wined3d: Add NVIDIA Geforce GTX 780 to supported device list. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 94a002e..4be7ea5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1269,6 +1269,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE6, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1675,6 +1676,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ @@ -2177,6 +2179,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i /* Maxwell */ {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ + {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e5d315..4ab45cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1495,6 +1495,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, + CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Jacek Caban : mshtml: Added IHTMLElementCollection::get__newEnum tests.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 2518b8f31b9d42c2bc5b2d3ddbecdd4953835eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2518b8f31b9d42c2bc5b2d3dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 13:48:55 2014 +0200 mshtml: Added IHTMLElementCollection::get__newEnum tests. --- dlls/mshtml/tests/dom.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 23677f4..65ca1d3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2108,9 +2108,12 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen) { IHTMLElementCollection *col; + IEnumVARIANT *enum_var; + IUnknown *enum_unk; + ULONG fetched; LONG len; DWORD i; - VARIANT name, index; + VARIANT name, index, v, vs[5]; IDispatch *disp, *disp2; HRESULT hres; @@ -2128,6 +2131,13 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_VT(&index) = VT_EMPTY; + hres = IHTMLElementCollection_get__newEnum(col, &enum_unk); + ok_(__FILE__,line)(hres == S_OK, "_newEnum failed: %08x\n", hres); + + hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); + IUnknown_Release(enum_unk); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEnumVARIANT iface: %08x\n", hres); + for(i=0; i<len; i++) { V_VT(&name) = VT_I4; V_I4(&name) = i; @@ -2151,9 +2161,53 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, IDispatch_Release(disp2); } + fetched = 0; + V_VT(&v) = VT_ERROR; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok_(__FILE__,line)(hres == S_OK, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(fetched == 1, "fetched = %d\n", fetched); + ok_(__FILE__,line)(V_VT(&v) == VT_DISPATCH && V_DISPATCH(&v), "V_VT(v) = %d\n", V_VT(&v)); + ok_(__FILE__,line)(iface_cmp((IUnknown*)disp, (IUnknown*)V_DISPATCH(&v)), "disp != V_DISPATCH(v)\n"); + IDispatch_Release(V_DISPATCH(&v)); + IDispatch_Release(disp); } + fetched = 0xdeadbeef; + V_VT(&v) = VT_BOOL; + hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); + ok_(__FILE__,line)(hres == S_FALSE, "Next returned %08x, expected S_FALSE\n", hres); + ok_(__FILE__,line)(fetched == 0, "fetched = %d\n", fetched); + ok_(__FILE__,line)(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IEnumVARIANT_Reset(enum_var); + ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + + hres = IEnumVARIANT_Skip(enum_var, len > 2 ? len-2 : 0); + ok_(__FILE__,line)(hres == S_OK, "Skip failed: %08x\n", hres); + + memset(vs, 0, sizeof(vs)); + fetched = 0; + hres = IEnumVARIANT_Next(enum_var, sizeof(vs)/sizeof(*vs), vs, &fetched); + ok_(__FILE__,line)(hres == S_FALSE, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(fetched == (len > 2 ? 2 : len), "fetched = %d\n", fetched); + if(len) { + ok_(__FILE__,line)(V_VT(vs) == VT_DISPATCH && V_DISPATCH(vs), "V_VT(vs[0]) = %d\n", V_VT(vs)); + IDispatch_Release(V_DISPATCH(vs)); + } + if(len > 1) { + ok_(__FILE__,line)(V_VT(vs+1) == VT_DISPATCH && V_DISPATCH(vs+1), "V_VT(vs[1]) = %d\n", V_VT(vs+1)); + IDispatch_Release(V_DISPATCH(vs+1)); + } + + hres = IEnumVARIANT_Reset(enum_var); + ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + + hres = IEnumVARIANT_Skip(enum_var, len+1); + ok_(__FILE__,line)(hres == S_FALSE, "Skip failed: %08x\n", hres); + + IEnumVARIANT_Release(enum_var); + V_VT(&name) = VT_I4; V_I4(&name) = len; disp = (void*)0xdeadbeef;

1 0

Piotr Caban : msvcrt: Use win_skip when function is not exported.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 92e12bb8fb5de8ce612a395722d4fcc5b01eb607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e12bb8fb5de8ce612a39572… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 13:08:31 2014 +0200 msvcrt: Use win_skip when function is not exported. --- dlls/msvcrt/tests/string.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c9d1c1d..11b5f44 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -492,7 +492,7 @@ static void test_strcpy_s(void) if(!pstrcpy_s) { - skip("strcpy_s not found\n"); + win_skip("strcpy_s not found\n"); return; } @@ -553,7 +553,7 @@ static void test_memcpy_s(void) static const char big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; int ret; if (!p_memcpy_s) { - skip("memcpy_s not found\n"); + win_skip("memcpy_s not found\n"); return; } @@ -609,7 +609,7 @@ static void test_memmove_s(void) static const char big[] = {'a','t','o','o','l','o','n','g','s','t','r','i','n','g',0}; int ret; if (!p_memmove_s) { - skip("memmove_s not found\n"); + win_skip("memmove_s not found\n"); return; } @@ -672,7 +672,7 @@ static void test_strcat_s(void) if(!pstrcat_s) { - skip("strcat_s not found\n"); + win_skip("strcat_s not found\n"); return; } @@ -736,7 +736,7 @@ static void test__mbsnbcpy_s(void) if(!p_mbsnbcpy_s) { - skip("_mbsnbcpy_s not found\n"); + win_skip("_mbsnbcpy_s not found\n"); return; }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for lighting_test().
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 9994cf8aecbc88e0b39331263b304cd6ba96021c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9994cf8aecbc88e0b39331263… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 21 08:10:36 2014 +0200 d3d8/tests: Use a separate device for lighting_test(). --- dlls/d3d8/tests/visual.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1238398..482e7ec 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -174,12 +174,16 @@ static void test_sanity(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); } -static void lighting_test(IDirect3DDevice8 *device) +static void lighting_test(void) { - HRESULT hr; - DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; - DWORD color; + DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; static const struct vertex unlitquad[] = { @@ -218,6 +222,16 @@ static void lighting_test(IDirect3DDevice8 *device) 0.0f, 0.0f, 0.0f, 1.0f, }}}; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); @@ -293,8 +307,11 @@ static void lighting_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void clear_test(void) @@ -4998,7 +5015,6 @@ START_TEST(visual) test_sanity(device_ptr); depth_clamp_test(device_ptr); - lighting_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -5006,6 +5022,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + lighting_test(); clear_test(); fog_test(); z_range_test();

1 0

Nikolay Sivov : mshtml/tests: Remove old system version check that doesn' t work anymore.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 95b6958752992f044eca6b0084d0bbed15b27056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b6958752992f044eca6b008… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 21 16:11:02 2014 +0400 mshtml/tests: Remove old system version check that doesn't work anymore. --- dlls/mshtml/tests/activex.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 2ceb8f0..852f81d 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2691,12 +2691,6 @@ static BOOL check_ie(void) IHTMLDocument5 *doc; HRESULT hres; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - - if(!lstrcmpW(xW, yW)) - return FALSE; - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument5, (void**)&doc); if(FAILED(hres))

1 0

Piotr Caban : msvcr80: Add type_info::name partial implementation.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 026ea82a2debf32aef53f5caf2f8946f68e18416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026ea82a2debf32aef53f5caf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 21 15:28:09 2014 +0200 msvcr80: Add type_info::name partial implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 27 +-------------------------- 5 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a9461b..9c20f28 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -465,8 +465,8 @@ @ stub -arch=win64 ?lock(a)reader_writer_lock@Concurrency@@QEAAXXZ @ stub -arch=win32 ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ @ stub -arch=win64 ?lock_read(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ thiscall -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ stub -arch=win32 ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ @ stub -arch=win64 ?native_handle(a)critical_section@Concurrency@@QEAAAEAV12(a)XZ @ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) MSVCRT_type_info_raw_name diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 68b48b7..0034b2f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -755,9 +755,9 @@ @ stub -arch=arm ?lock_read(a)reader_writer_lock@Concurrency@@QAAXXZ @ stub -arch=i386 ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ @ stub -arch=win64 ?lock_read(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub -arch=arm ?name(a)type_info@@QBAPBDPAU__type_info_node@@@Z -@ stub -arch=i386 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ cdecl -arch=arm ?name(a)type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ thiscall -arch=i386 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ stub -arch=arm ?native_handle(a)critical_section@Concurrency@@QAAAAV12(a)XZ @ stub -arch=i386 ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ @ stub -arch=win64 ?native_handle(a)critical_section@Concurrency@@QEAAAEAV12(a)XZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 105970a..1caa7e0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -113,8 +113,8 @@ @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) MSVCRT__wsopen @ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) MSVCRT_type_info_before -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ thiscall -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) MSVCRT_type_info_raw_name @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) MSVCRT_type_info_raw_name @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) MSVCRT_type_info_raw_name diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 20260e2..b624bd0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -113,8 +113,8 @@ @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH(a)Z(wstr long long long) MSVCRT__wsopen @ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) MSVCRT_type_info_before -@ stub -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const -@ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ thiscall -arch=win32 ?name(a)type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method +@ cdecl -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method @ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) MSVCRT_type_info_raw_name @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) MSVCRT_type_info_raw_name @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) MSVCRT_type_info_raw_name diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index cffcdd7..e392208 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1191,32 +1191,7 @@ DEFINE_THISCALL_WRAPPER(type_info_name_internal_method,8) const char * __thiscall type_info_name_internal_method(type_info * _this, struct __type_info_node *node) { static int once; - if (node && !once++) FIXME("type_info_node parameter ignored\n"); - if (!_this->name) - { - /* Create and set the demangled name */ - /* Note: mangled name in type_info struct always starts with a '.', while - * it isn't valid for mangled name. - * Is this '.' really part of the mangled name, or has it some other meaning ? - */ - char* name = __unDName(0, _this->mangled + 1, 0, MSVCRT_malloc, MSVCRT_free, 0x2800); - if (name) - { - unsigned int len = strlen(name); - - /* It seems _unDName may leave blanks at the end of the demangled name */ - while (len && name[--len] == ' ') - name[len] = '\0'; - - if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL)) - { - /* Another thread set this member since we checked above - use it */ - MSVCRT_free(name); - } - } - } - TRACE("(%p) returning %s\n", _this, _this->name); - return _this->name; + return MSVCRT_type_info_name(_this); }

1 0