wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Jacek Caban : mshtml: Skip tests depending on iframe onload event on IEs older than IE9.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 74067c56b1460205946e3460ac0db3e06eb224a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74067c56b1460205946e3460a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:13:30 2014 +0100 mshtml: Skip tests depending on iframe onload event on IEs older than IE9. --- dlls/mshtml/tests/events.c | 123 +++++++++++++++++++++++++++----------------- dlls/mshtml/tests/script.c | 64 ++++++++++++++++------- 2 files changed, 119 insertions(+), 68 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d1a36f0..6755591 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -89,6 +89,7 @@ static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; static BOOL xy_todo; +static BOOL is_ie9plus; typedef struct { LONG x; @@ -2170,13 +2171,11 @@ static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) static void test_iframe_connections(IHTMLDocument2 *doc) { - IHTMLFrameBase2 *frame_base2; IHTMLIFrameElement *iframe; IHTMLDocument2 *iframes_doc; DWORD cookie; IConnectionPoint *cp; IHTMLElement *element; - VARIANT v; BSTR str; HRESULT hres; @@ -2198,33 +2197,40 @@ static void test_iframe_connections(IHTMLDocument2 *doc) unregister_cp((IUnknown*)iframes_doc, &IID_IDispatch, cookie); - hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&frame_base2); - ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); + if(is_ie9plus) { + IHTMLFrameBase2 *frame_base2; + VARIANT v; - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = (IDispatch*)&iframe_onload_obj; - hres = IHTMLFrameBase2_put_onload(frame_base2, v); - ok(hres == S_OK, "put_onload failed: %08x\n", hres); + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&frame_base2); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); - IHTMLFrameBase2_Release(frame_base2); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&iframe_onload_obj; + hres = IHTMLFrameBase2_put_onload(frame_base2, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); - str = a2bstr("about:blank"); - hres = IHTMLDocument2_put_URL(iframes_doc, str); - ok(hres == S_OK, "put_URL failed: %08x\n", hres); - SysFreeString(str); + IHTMLFrameBase2_Release(frame_base2); - SET_EXPECT(iframe_onload); - pump_msgs(&called_iframe_onload); - CHECK_CALLED(iframe_onload); + str = a2bstr("about:blank"); + hres = IHTMLDocument2_put_URL(iframes_doc, str); + ok(hres == S_OK, "put_URL failed: %08x\n", hres); + SysFreeString(str); - str = a2bstr("about:test"); - hres = IHTMLDocument2_put_URL(iframes_doc, str); - ok(hres == S_OK, "put_URL failed: %08x\n", hres); - SysFreeString(str); + SET_EXPECT(iframe_onload); + pump_msgs(&called_iframe_onload); + CHECK_CALLED(iframe_onload); - SET_EXPECT(iframe_onload); - pump_msgs(&called_iframe_onload); - CHECK_CALLED(iframe_onload); + str = a2bstr("about:test"); + hres = IHTMLDocument2_put_URL(iframes_doc, str); + ok(hres == S_OK, "put_URL failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(iframe_onload); + pump_msgs(&called_iframe_onload); + CHECK_CALLED(iframe_onload); + }else { + win_skip("Skipping iframe onload tests on IE older than 9.\n"); + } IHTMLDocument2_Release(iframes_doc); } @@ -2733,24 +2739,12 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; - IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); - if (FAILED(hres)) - return NULL; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - if(FAILED(hres)) { - win_skip("Could not get IHTMLDocument5 interface, probably too old IE\n"); - IHTMLDocument2_Release(doc); - return NULL; - } - - IHTMLDocument5_Release(doc5); - return doc; + return SUCCEEDED(hres) ? doc : NULL; } @@ -2851,24 +2845,57 @@ static void test_empty_document(void) IHTMLDocument2_Release(doc); } +static BOOL check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; + IHTMLDocument7 *doc7; + HRESULT hres; + + doc = create_document(); + if(!doc) + return FALSE; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(SUCCEEDED(hres)) + IHTMLDocument5_Release(doc5); + + IHTMLDocument2_Release(doc); + return SUCCEEDED(hres); +} + START_TEST(events) { CoInitialize(NULL); - container_hwnd = create_container_window(); - if(winetest_interactive) - ShowWindow(container_hwnd, SW_SHOW); + if(check_ie()) { + container_hwnd = create_container_window(); - run_test(empty_doc_str, test_timeout); - run_test(click_doc_str, test_onclick); - run_test(readystate_doc_str, test_onreadystatechange); - run_test(img_doc_str, test_imgload); - run_test(input_doc_str, test_focus); - run_test(form_doc_str, test_submit); - run_test(iframe_doc_str, test_iframe_connections); + if(winetest_interactive) + ShowWindow(container_hwnd, SW_SHOW); - test_empty_document(); + run_test(empty_doc_str, test_timeout); + run_test(click_doc_str, test_onclick); + run_test(readystate_doc_str, test_onreadystatechange); + run_test(img_doc_str, test_imgload); + run_test(input_doc_str, test_focus); + run_test(form_doc_str, test_submit); + run_test(iframe_doc_str, test_iframe_connections); + + test_empty_document(); + + DestroyWindow(container_hwnd); + }else { + win_skip("Too old IE\n"); + } - DestroyWindow(container_hwnd); CoUninitialize(); } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index de0bf65..df52a75 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -150,6 +150,7 @@ static const GUID CLSID_TestScript = static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; +static BOOL is_ie9plus; static IHTMLDocument2 *notif_doc; static IOleDocumentView *view; static IDispatchEx *window_dispex; @@ -1165,23 +1166,12 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; - IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); - if (hres != S_OK) return NULL; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - if(FAILED(hres)) { - win_skip("Could not get IHTMLDocument5, probably too old IE\n"); - IHTMLDocument2_Release(doc); - return NULL; - } - - IHTMLDocument5_Release(doc5); - return doc; + return SUCCEEDED(hres) ? doc : NULL; } static void load_string(IHTMLDocument2 *doc, const char *str) @@ -2831,7 +2821,10 @@ static void run_js_tests(void) run_js_script("exectest.html"); run_js_script("vbtest.html"); run_js_script("events.html"); - run_js_script("nav_test.html"); + if(is_ie9plus) + run_js_script("nav_test.html"); + else + win_skip("Skipping nav_test.html on IE older than 9 (for broken ieframe onload).\n"); } static BOOL init_registry(BOOL init) @@ -2883,21 +2876,52 @@ static HWND create_container_window(void) 300, 300, NULL, NULL, NULL, NULL); } +static BOOL check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; + IHTMLDocument7 *doc7; + HRESULT hres; + + doc = create_document(); + if(!doc) + return FALSE; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(SUCCEEDED(hres)) + IHTMLDocument5_Release(doc5); + + IHTMLDocument2_Release(doc); + return SUCCEEDED(hres); +} + START_TEST(script) { CoInitialize(NULL); container_hwnd = create_container_window(); - if(winetest_interactive || ! is_ie_hardened()) { - if(register_script_engine()) { - test_simple_script(); - init_registry(FALSE); + if(check_ie()) { + if(winetest_interactive || ! is_ie_hardened()) { + if(register_script_engine()) { + test_simple_script(); + init_registry(FALSE); + }else { + skip("Could not register TestScript engine\n"); + } + run_js_tests(); }else { - skip("Could not register TestScript engine\n"); + skip("IE running in Enhanced Security Configuration\n"); } - run_js_tests(); }else { - skip("IE running in Enhanced Security Configuration\n"); + win_skip("Too old IE.\n"); } DestroyWindow(container_hwnd);

1 0

Jacek Caban : mshtml: Added IHTMLDocument7 stub implementation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: e5dbd6e9f0e1b0b90568387d798775175059f893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dbd6e9f0e1b0b90568387d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:13:11 2014 +0100 mshtml: Added IHTMLDocument7 stub implementation. --- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/navigate.c | 104 +---- dlls/mshtml/htmldoc.c | 903 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 6 +- 5 files changed, 928 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5dbd6e9f0e1b0b905683…

1 0

Henri Verbeet : d3d9/tests: Give add_dirty_rect_test() its own device.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: b02129aa9046dfeb8b090eda1c434842586c8309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02129aa9046dfeb8b090eda1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:19 2014 +0100 d3d9/tests: Give add_dirty_rect_test() its own device. We want to avoid tests accidentally depending on state set by previous tests. For example, add_dirty_rect_test() had a dependency on D3DRS_CULLMODE being D3DCULL_NONE, set by lighting_test(). --- dlls/d3d9/tests/visual.c | 58 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ca1eb6f..7ee8be5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -171,13 +171,13 @@ out: return ret; } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); + present_parameters.Windowed = windowed; + present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -185,18 +185,19 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; - DestroyWindow(present_parameters.hDeviceWindow); return NULL; } static IDirect3DDevice9 *init_d3d9(void) { D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DDevice9 *device; IDirect3D9 *d3d9; + HWND window; HRESULT hr; if (!(d3d9 = Direct3DCreate9(D3D_SDK_VERSION))) @@ -220,7 +221,13 @@ static IDirect3DDevice9 *init_d3d9(void) HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); - return create_device(d3d9); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if ((device = create_device(d3d9, window, window, TRUE))) + return device; + + DestroyWindow(window); + return NULL; } static void cleanup_device(IDirect3DDevice9 *device) @@ -8727,7 +8734,9 @@ static void stencil_cull_test(void) { IDirect3DDevice9 *device; IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; static const float quad1[] = { @@ -8769,11 +8778,14 @@ static void stencil_cull_test(void) unsigned int i; DWORD color; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d))) + if (!(device = create_device(d3d, window, window, TRUE))) { skip("Cannot create a device with a D24S8 stencil buffer.\n"); + DestroyWindow(window); IDirect3D9_Release(d3d); return; } @@ -8925,8 +8937,10 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); cleanup: - cleanup_device(device); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); + DestroyWindow(window); } static void vpos_register_test(IDirect3DDevice9 *device) @@ -14986,8 +15000,8 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) quad[] = { {{-1.0, -1.0, 0.0}, {0.0, 0.0}}, - {{ 1.0, -1.0, 0.0}, {1.0, 0.0}}, {{-1.0, 1.0, 0.0}, {0.0, 1.0}}, + {{ 1.0, -1.0, 0.0}, {1.0, 0.0}}, {{ 1.0, 1.0, 0.0}, {1.0, 1.0}}, }; @@ -14999,17 +15013,33 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); } -static void add_dirty_rect_test(IDirect3DDevice9 *device) +static void add_dirty_rect_test(void) { HRESULT hr; IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; unsigned int i; + ULONG refcount; DWORD *texel; + HWND window; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; DWORD color; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(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"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dst1, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); @@ -15297,6 +15327,10 @@ static void add_dirty_rect_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(tex_dst1); IDirect3DTexture9_Release(tex_dst2); IDirect3DTexture9_Release(tex_managed); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); } START_TEST(visual) @@ -15468,11 +15502,11 @@ START_TEST(visual) fog_special_test(device_ptr); volume_srgb_test(device_ptr); volume_dxt5_test(device_ptr); - add_dirty_rect_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + add_dirty_rect_test(); multisampled_depth_buffer_test(); resz_test(); stencil_cull_test();

1 0

Jacek Caban : mshtml: Merge htmldoc3.c into htmldoc.c.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: f2676d3729c3e5ac197073431148fa13552e6735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2676d3729c3e5ac197073431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:12:50 2014 +0100 mshtml: Merge htmldoc3.c into htmldoc.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1254 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmldoc3.c | 1294 ------------------------------------------ dlls/mshtml/mshtml_private.h | 2 - 4 files changed, 1253 insertions(+), 1298 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2676d3729c3e5ac19707…

1 0

Henri Verbeet : d3d9/tests: Don' t share the D3D object either in visual.c tests that have their own device.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: cac52b4b10ffed8328d82988dbe48972e6a6a791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac52b4b10ffed8328d82988d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:18 2014 +0100 d3d9/tests: Don't share the D3D object either in visual.c tests that have their own device. --- dlls/d3d9/tests/visual.c | 81 ++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d921dc..ca1eb6f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8723,9 +8723,10 @@ cleanup: IDirect3DVertexDeclaration9_Release(vertex_declaration); } -static void stencil_cull_test(IDirect3D9 *d3d9) +static void stencil_cull_test(void) { IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCAPS9 caps; HRESULT hr; static const float quad1[] = @@ -8768,10 +8769,12 @@ static void stencil_cull_test(IDirect3D9 *d3d9) unsigned int i; DWORD color; - device = create_device(d3d9); - if (!device) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d))) { skip("Cannot create a device with a D24S8 stencil buffer.\n"); + IDirect3D9_Release(d3d); return; } hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -8923,6 +8926,7 @@ static void stencil_cull_test(IDirect3D9 *d3d9) cleanup: cleanup_device(device); + IDirect3D9_Release(d3d); } static void vpos_register_test(IDirect3DDevice9 *device) @@ -13528,10 +13532,11 @@ static void multisample_get_rtdata_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt); } -static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) +static void multisampled_depth_buffer_test(void) { IDirect3DDevice9 *device = 0; IDirect3DSurface9 *original_rt, *rt, *readback, *ds, *original_ds; + IDirect3D9 *d3d; D3DCAPS9 caps; HRESULT hr; D3DPRESENT_PARAMETERS present_parameters; @@ -13572,18 +13577,21 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) {560, 450, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff)}, }; - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled depth buffer test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_D24S8, skipping multisampled depth buffer test.\n"); + IDirect3D9_Release(d3d); return; } @@ -13598,7 +13606,7 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -13735,7 +13743,7 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_NONE; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -13828,9 +13836,10 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) IDirect3DSurface9_Release(rt); cleanup: cleanup_device(device); + IDirect3D9_Release(d3d); } -static void resz_test(IDirect3D9 *d3d9) +static void resz_test(void) { IDirect3DDevice9 *device = 0; IDirect3DSurface9 *rt, *original_rt, *ds, *readback, *intz_ds; @@ -13882,36 +13891,40 @@ static void resz_test(IDirect3D9 *d3d9) }; IDirect3DTexture9 *texture; IDirect3DPixelShader9 *ps; + IDirect3D9 *d3d; DWORD value; - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_D24S8, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')))) { skip("No INTZ support, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, MAKEFOURCC('R','E','S','Z')); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, MAKEFOURCC('R','E','S','Z')))) { skip("No RESZ support, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } @@ -13926,7 +13939,7 @@ static void resz_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_NONE; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -13936,12 +13949,14 @@ static void resz_test(IDirect3D9 *d3d9) { skip("No pixel shader 2.0 support, skipping INTZ test.\n"); cleanup_device(device); + IDirect3D9_Release(d3d); return; } if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No unconditional NP2 texture support, skipping INTZ test.\n"); cleanup_device(device); + IDirect3D9_Release(d3d); return; } @@ -14082,7 +14097,7 @@ static void resz_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -14301,6 +14316,7 @@ static void resz_test(IDirect3D9 *d3d9) IDirect3DSurface9_Release(readback); IDirect3DSurface9_Release(original_rt); cleanup_device(device); + IDirect3D9_Release(d3d); } static void zenable_test(IDirect3DDevice9 *device) @@ -15285,7 +15301,6 @@ static void add_dirty_rect_test(IDirect3DDevice9 *device) START_TEST(visual) { - IDirect3D9 *d3d9; IDirect3DDevice9 *device_ptr; D3DCAPS9 caps; HRESULT hr; @@ -15455,16 +15470,12 @@ START_TEST(visual) volume_dxt5_test(device_ptr); add_dirty_rect_test(device_ptr); - hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); cleanup_device(device_ptr); device_ptr = NULL; - multisampled_depth_buffer_test(d3d9); - resz_test(d3d9); - stencil_cull_test(d3d9); - - IDirect3D9_Release(d3d9); + multisampled_depth_buffer_test(); + resz_test(); + stencil_cull_test(); cleanup: cleanup_device(device_ptr);

1 0

Henri Verbeet : d3d8/tests: Move some stateblock tests to device.c.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 8db0401f60687d7d67c1bc254a25e535d3da7f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db0401f60687d7d67c1bc254… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:17 2014 +0100 d3d8/tests: Move some stateblock tests to device.c. --- dlls/d3d8/tests/device.c | 210 ++++++++++++++++++++++++++++++++ dlls/d3d8/tests/stateblock.c | 270 ++++++------------------------------------ 2 files changed, 249 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db0401f60687d7d67c1b…

1 0

Henri Verbeet : d3d9/tests: Move some stateblock tests to device.c.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 6f1b494a9074e1f9bfb41ecf410f7cac7d82579e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1b494a9074e1f9bfb41ecf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:16 2014 +0100 d3d9/tests: Move some stateblock tests to device.c. --- dlls/d3d9/tests/device.c | 400 ++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/stateblock.c | 432 ++++-------------------------------------- 2 files changed, 436 insertions(+), 396 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f1b494a9074e1f9bfb41…

1 0

Henri Verbeet : wined3d: Only use a single allocation for each struct private_data.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 64dd435e2ae491f1e6b9174ceda486e9743a46de URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dd435e2ae491f1e6b9174ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:15 2014 +0100 wined3d: Only use a single allocation for each struct private_data. --- dlls/wined3d/resource.c | 50 +++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8813af7..6c3fd7a 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -33,14 +33,12 @@ struct private_data GUID tag; DWORD flags; /* DDSPD_* */ - + DWORD size; union { - void *data; + BYTE data[1]; IUnknown *object; } ptr; - - DWORD size; }; static DWORD resource_access_from_pool(enum wined3d_pool pool) @@ -207,40 +205,32 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc const void *data, DWORD data_size, DWORD flags) { struct private_data *d; + const void *ptr = data; TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", resource, debugstr_guid(guid), data, data_size, flags); - if (flags & WINED3DSPD_IUNKNOWN && data_size != sizeof(IUnknown *)) + if (flags & WINED3DSPD_IUNKNOWN) { - WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); - return WINED3DERR_INVALIDCALL; + if (data_size != sizeof(IUnknown *)) + { + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + return WINED3DERR_INVALIDCALL; + } + ptr = &data; } - d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); - if (!d) return E_OUTOFMEMORY; + if (!(d = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct private_data, ptr.data[data_size])))) + return E_OUTOFMEMORY; + wined3d_resource_free_private_data(resource, guid); d->tag = *guid; d->flags = flags; + d->size = data_size; + memcpy(d->ptr.data, ptr, data_size); if (flags & WINED3DSPD_IUNKNOWN) - { - d->ptr.object = (IUnknown *)data; - d->size = sizeof(IUnknown *); IUnknown_AddRef(d->ptr.object); - } - else - { - d->ptr.data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!d->ptr.data) - { - HeapFree(GetProcessHeap(), 0, d); - return E_OUTOFMEMORY; - } - d->size = data_size; - memcpy(d->ptr.data, data, data_size); - } - wined3d_resource_free_private_data(resource, guid); list_add_tail(&resource->privateData, &d->entry); return WINED3D_OK; @@ -294,16 +284,8 @@ HRESULT CDECL wined3d_resource_free_private_data(struct wined3d_resource *resour if (!data) return WINED3DERR_NOTFOUND; if (data->flags & WINED3DSPD_IUNKNOWN) - { - if (data->ptr.object) - IUnknown_Release(data->ptr.object); - } - else - { - HeapFree(GetProcessHeap(), 0, data->ptr.data); - } + IUnknown_Release(data->ptr.object); list_remove(&data->entry); - HeapFree(GetProcessHeap(), 0, data); return WINED3D_OK;

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::vAlign property implementation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 3679619909f9ce04d5deb8f4046e7dba80261972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3679619909f9ce04d5deb8f40… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Mar 13 16:27:32 2014 +0800 mshtml: Added IHTMLTableRow::vAlign property implementation. --- dlls/mshtml/htmltablerow.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index ef01763..832cb6c 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -135,15 +135,36 @@ static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p) static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&val, v); + + nsres = nsIDOMHTMLTableRowElement_SetVAlign(This->nsrow, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set VAlign(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableRowElement_GetVAlign(This->nsrow, &val); + + return return_nsstr(nsres, &val, p); } static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b485203..013a2a9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5605,6 +5605,18 @@ static void test_tr_elem(IHTMLElement *elem) ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + bstr = a2bstr("top"); + hres = IHTMLTableRow_put_vAlign(row, bstr); + ok(hres == S_OK, "set_valign failed: %08x\n", hres); + SysFreeString(bstr); + + bstr = NULL; + hres = IHTMLTableRow_get_vAlign(row, &bstr); + ok(hres == S_OK, "get_valign failed: %08x\n", hres); + ok(bstr != NULL, "get_valign returned NULL\n"); + ok(!strcmp_wa(bstr, "top"), "get_valign returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLTableRow_Release(row); }

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 03cec9d886938aafbc33b805e6197327f0709fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cec9d886938aafbc33b805e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 13 08:58:47 2014 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/int21.c | 4 ++-- dlls/krnl386.exe16/int31.c | 6 +++--- dlls/krnl386.exe16/soundblaster.c | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 53b6537..45a8149 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2737,7 +2737,7 @@ static void INT21_IoctlHPScanHandler( CONTEXT *context ) static void INT21_Ioctl_Char( CONTEXT *context ) { int status; - int IsConsoleIOHandle = 0; + BOOL IsConsoleIOHandle = FALSE; IO_STATUS_BLOCK io; FILE_INTERNAL_INFORMATION info; HANDLE handle = DosFileHandleToWin32Handle(BX_reg(context)); @@ -2746,7 +2746,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) if (status) { if( VerifyConsoleIoHandle( handle)) - IsConsoleIOHandle = 1; + IsConsoleIOHandle = TRUE; else { SET_AX( context, RtlNtStatusToDosError(status) ); SET_CFLAG( context ); diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index e7413cc..2f01452 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -439,7 +439,7 @@ int DPMI_CallRMProc( CONTEXT *context, LPWORD stack, int args, int iret ) LPWORD stack16; LPVOID addr = NULL; /* avoid gcc warning */ RMCB *CurrRMCB; - int alloc = 0, already = 0; + BOOL alloc = FALSE, already = FALSE; BYTE *code; TRACE("EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", @@ -490,7 +490,7 @@ callrmproc_again: } if (!already) { if (!context->SegSs) { - alloc = 1; /* allocate default stack */ + alloc = TRUE; /* allocate default stack */ stack16 = addr = DOSMEM_AllocBlock( 64, (UINT16 *)&(context->SegSs) ); context->Esp = 64-2; stack16 += 32-1; @@ -514,7 +514,7 @@ callrmproc_again: *(--stack16) = 0; /* adjust stack */ context->Esp -= 2*sizeof(WORD); - already = 1; + already = TRUE; } if (CurrRMCB) { diff --git a/dlls/krnl386.exe16/soundblaster.c b/dlls/krnl386.exe16/soundblaster.c index ca62732..8939bb3 100644 --- a/dlls/krnl386.exe16/soundblaster.c +++ b/dlls/krnl386.exe16/soundblaster.c @@ -48,8 +48,8 @@ static int InSize; /* Nb of bytes in InBuffer */ static BYTE DSP_OutBuffer[10]; /* Store DSP information bytes to host */ static int OutSize; /* Nb of bytes in InBuffer */ static int command; /* Current command */ -static int end_sound_loop = 0; -static int dma_enable = 0; +static BOOL end_sound_loop = FALSE; +static BOOL dma_enable = FALSE; /* The maximum size of a dma transfer can be 65536 */ #define DMATRFSIZE 1024 @@ -112,7 +112,7 @@ static DWORD CALLBACK SB_Poll( void *dummy ) SamplesCount -= size; if (!SamplesCount) { DOSVM_QueueEvent(SB_IRQ,SB_IRQ_PRI,NULL,NULL); - dma_enable = 0; + dma_enable = FALSE; } } return 0; @@ -166,7 +166,7 @@ static BOOL SB_Init(void) } buf_off = 0; - end_sound_loop = 0; + end_sound_loop = FALSE; SB_Thread = CreateThread(NULL, 0, SB_Poll, NULL, 0, NULL); TRACE("thread\n"); if (!SB_Thread) { @@ -254,7 +254,7 @@ void SB_ioport_out( WORD port, BYTE val ) case 0x14: /* SB */ SamplesCount = DSP_InBuffer[1]+(val<<8)+1; TRACE("DMA DAC (8-bit) for %x samples\n",SamplesCount); - dma_enable = 1; + dma_enable = TRUE; break; case 0x20: FIXME("Direct ADC (8-bit) - Not Implemented\n"); @@ -274,7 +274,7 @@ void SB_ioport_out( WORD port, BYTE val ) /* case 0xBX/0xCX -> See below */ case 0xD0: /* SB */ TRACE("Halt DMA operation (8-bit)\n"); - dma_enable = 0; + dma_enable = FALSE; break; case 0xD1: /* SB */ FIXME("Enable Speaker - Not Implemented\n"); @@ -331,7 +331,7 @@ void SB_ioport_out( WORD port, BYTE val ) FIXME("Generic DAC/ADC stereo mode not supported\n"); SamplesCount = DSP_InBuffer[2]+(val<<8)+1; TRACE("Generic DMA for %x samples\n",SamplesCount); - dma_enable = 1; + dma_enable = TRUE; } else FIXME("DSP command %x not supported\n",val);

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
53
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 March 2014