February 2015 - Wine-Commits

Henri Verbeet : dxgi: Implement dxgi_device_GetPrivateData().
by Alexandre Julliard Feb. 12, 2015

Feb. 12, 2015

Module: wine Branch: master Commit: 2d18cf57acb5be6a6bc00e31a915a340dab9a7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d18cf57acb5be6a6bc00e31a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 12 09:34:59 2015 +0100 dxgi: Implement dxgi_device_GetPrivateData(). --- dlls/dxgi/device.c | 6 ++++-- dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/tests/device.c | 32 ++++++++++++++++---------------- dlls/dxgi/utils.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 8b32041..2b8a05f 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -116,9 +116,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_SetPrivateDataInterface(IWineDXGIDe static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IWineDXGIDevice *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&device->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, REFIID riid, void **parent) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 655dd40..55837f9 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -76,6 +76,8 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +HRESULT dxgi_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT dxgi_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b00c5e4..9181c42 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -634,9 +634,9 @@ static void test_private_data(void) size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); - todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, @@ -677,11 +677,11 @@ static void test_private_data(void) size = 2 * sizeof(ptr); ptr = NULL; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); expected_refcount++; refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); if (ptr) IUnknown_Release(ptr); expected_refcount--; @@ -689,29 +689,29 @@ static void test_private_data(void) ptr = (IUnknown *)0xdeadbeef; size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); size = 2 * sizeof(ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); size = 0xdeadbabe; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, &size, &ptr); - todo_wine ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == 0, "Got unexpected size %u.\n", size); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, NULL, &ptr); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); refcount = IDXGIDevice_Release(device); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 576a9ba..be2b5f7 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -325,6 +325,48 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +HRESULT dxgi_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + HRESULT hr; + + if (!data_size) + return E_INVALIDARG; + + EnterCriticalSection(&dxgi_cs); + if (!(stored_data = wined3d_private_store_get_private_data(store, guid))) + { + hr = DXGI_ERROR_NOT_FOUND; + *data_size = 0; + goto done; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + { + hr = S_OK; + goto done; + } + if (size_in < stored_data->size) + { + hr = DXGI_ERROR_MORE_DATA; + goto done; + } + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + hr = S_OK; + +done: + LeaveCriticalSection(&dxgi_cs); + + return hr; +} + HRESULT dxgi_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) {

1 0

Stefan Dösinger : d3d9/tests: Test rhw depth clip with z enabled but no depth buffer set.
by Alexandre Julliard Feb. 12, 2015

Feb. 12, 2015

Module: wine Branch: master Commit: fd218b93d0dfb4db1f48904bbc29f402ba38f522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd218b93d0dfb4db1f48904bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:45 2015 +0100 d3d9/tests: Test rhw depth clip with z enabled but no depth buffer set. --- dlls/d3d9/tests/visual.c | 78 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1f42f5a..b4df9c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15449,6 +15449,8 @@ static void zenable_test(void) HRESULT hr; UINT x, y; UINT i, j; + UINT test; + IDirect3DSurface9 *ds; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -15460,34 +15462,66 @@ static void zenable_test(void) goto done; } - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds); + ok(SUCCEEDED(hr), "Failed to get depth stencil surface, hr %#x.\n", hr); - for (i = 0; i < 4; ++i) + for (test = 0; test < 2; ++test) { - for (j = 0; j < 4; ++j) + /* The Windows 8 testbot (WARP) appears to clip with + * ZENABLE = D3DZB_TRUE and no depth buffer set. */ + static const D3DCOLOR expected_broken[] = { - x = 80 * ((2 * j) + 1); - y = 60 * ((2 * i) + 1); - color = getPixelColor(device, x, y); - ok(color_match(color, 0x0000ff00, 1), - "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + }; + + if (!test) + { + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); } + else + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1) + || broken(color_match(color, expected_broken[i * 4 + j], 1) && !test), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x, test %u.\n", + x, y, color, test); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);

1 0

Jacek Caban : mshtml: Call FireBeforeNavigate2 for navigation in frames and iframes.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: 9e2a446fad0b2cd78c4efacb3ee77a3fd925c0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2a446fad0b2cd78c4efacb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 13:06:04 2015 +0100 mshtml: Call FireBeforeNavigate2 for navigation in frames and iframes. --- dlls/mshtml/navigate.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 878e582..c2d4603 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2245,23 +2245,32 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->webbrowser && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->webbrowser) { DWORD post_data_len = request_data ? request_data->post_data_len : 0; void *post_data = post_data_len ? request_data->post_data : NULL; const WCHAR *headers = request_data ? request_data->headers : NULL; if(!(flags & BINDING_REFRESH)) { + BSTR frame_name = NULL; BOOL cancel = FALSE; + if(window != window->doc_obj->basedoc.window) { + hres = IHTMLWindow2_get_name(&window->base.IHTMLWindow2_iface, &frame_name); + if(FAILED(hres)) + return hres; + } + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, - NULL, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); + frame_name, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); + SysFreeString(frame_name); if(SUCCEEDED(hres) && cancel) { TRACE("Navigation canceled\n"); return S_OK; } } - return super_navigate(window, uri, flags, headers, post_data, post_data_len); + if(window == window->doc_obj->basedoc.window) + return super_navigate(window, uri, flags, headers, post_data, post_data_len); } if(window->doc_obj && window == window->doc_obj->basedoc.window) {

1 0

Alexandre Julliard : msvcp70: Fix calling convention for a non-member function.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: dc06802a42a380bd90d2f21d243cdff8d7518c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc06802a42a380bd90d2f21d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 23:02:03 2015 +0900 msvcp70: Fix calling convention for a non-member function. --- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 22669fb..2e98230 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1090,8 +1090,8 @@ @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)N@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@ABV?$complex(a)O@0@@Z @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEBV?$complex(a)O@0@@Z -@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort -@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort_global +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z(ptr long) basic_ostream_short_print_ushort_global @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@PBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@PEBG(a)Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 39c59b6..1c6111c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7129,6 +7129,14 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_ushort(basic_ostream_w basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } +/* ??6std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@G(a)Z */ +/* ??6std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@G(a)Z */ +basic_ostream_wchar* __cdecl basic_ostream_short_print_ushort_global(basic_ostream_wchar *ostr, unsigned short val) +{ + return basic_ostream_print_ushort(ostr, val, num_put_short_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(ostr))->loc)); +} + static basic_ostream_wchar* basic_ostream_print_int(basic_ostream_wchar *this, int val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this);

1 0

Henri Verbeet : wined3d: Add some warnings when resource_init() fails due to format restrictions.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: 5045ca639d3053b4722976aa5fac0cda1def5f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5045ca639d3053b4722976aa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:14 2015 +0100 wined3d: Add some warnings when resource_init() fails due to format restrictions. --- dlls/wined3d/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0ab55dc..f4134e2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -84,11 +84,20 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (pool != WINED3D_POOL_SCRATCH) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) + { + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } } resource->ref = 1;

1 0

Jacek Caban : ieframe: Keep reference to This in all IDocObjectService callback calls.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: f46ee92d906063c5d28bb45812553d989e924a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46ee92d906063c5d28bb4581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 13:05:54 2015 +0100 ieframe: Keep reference to This in all IDocObjectService callback calls. --- dlls/ieframe/shellbrowser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 216d3f4..51316b4 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -708,10 +708,15 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); TRACE("<<<\n"); + IShellBrowser_Release(&This->IShellBrowser_iface); + SysFreeString(V_BSTR(&var_url)); SysFreeString(V_BSTR(&var_headers)); SysFreeString(V_BSTR(&var_frame_name)); @@ -764,6 +769,9 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dp); TRACE("<<<\n"); @@ -771,6 +779,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( SysFreeString(url); This->doc_host->busy = VARIANT_FALSE; + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; }

1 0

Austin English : connect: Add IsInternetConnected stub.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: e94fc1db5a749670102f46df42e327ab8cd0013d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94fc1db5a749670102f46df4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 10 14:12:38 2015 -0600 connect: Add IsInternetConnected stub. --- dlls/connect/connect.spec | 2 +- dlls/connect/main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/connect/connect.spec b/dlls/connect/connect.spec index 6b4da21..7251c34 100644 --- a/dlls/connect/connect.spec +++ b/dlls/connect/connect.spec @@ -7,7 +7,7 @@ @ stub GetVPNConnected @ stub HrIsInternetConnected @ stub HrIsInternetConnectedGUID -@ stub IsInternetConnected +@ stdcall IsInternetConnected() @ stub IsInternetConnectedGUID @ stub IsUniqueConnectionName @ stub RegisterPageWithPage diff --git a/dlls/connect/main.c b/dlls/connect/main.c index 1c12f72..a84ca76 100644 --- a/dlls/connect/main.c +++ b/dlls/connect/main.c @@ -22,6 +22,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(connect); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +39,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT WINAPI IsInternetConnected(void) +{ + FIXME("stub, faking success!\n"); + return S_OK; +}

1 0

Henri Verbeet : wined3d: Recognize the SM4 ne opcode.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: 3225fea30ccc913b74e2e90e042efda9abdf25ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3225fea30ccc913b74e2e90e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:17 2015 +0100 wined3d: Recognize the SM4 ne opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 763a4a2..e543ebf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5238,6 +5238,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_hw_map2gl, + /* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ac1b5c..6e6be8d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2357,6 +2357,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = "greaterThanEqual"; break; case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; + case WINED3DSIH_NE: op = "notEqual"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -2375,6 +2376,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = ">="; break; case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; + case WINED3DSIH_NE: op = "!="; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -6772,6 +6774,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ shader_glsl_conditional_move, /* WINED3DSIH_MUL */ shader_glsl_binop, + /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 766e91f..f98074e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_MOVA */ "mova", /* WINED3DSIH_MOVC */ "movc", /* WINED3DSIH_MUL */ "mul", + /* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_PHASE */ "phase", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 046b252..acf4b37 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -111,6 +111,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, + WINED3D_SM4_OP_NE = 0x39, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, @@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, "F", "F"}, {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, + {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 539f18c..1415990 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_MOVA, WINED3DSIH_MOVC, WINED3DSIH_MUL, + WINED3DSIH_NE, WINED3DSIH_NOP, WINED3DSIH_NRM, WINED3DSIH_PHASE,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_SQRT in the GLSL shader backend.
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: 8506da62e0ac9ab882a9689d326fcac638788c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8506da62e0ac9ab882a9689d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:16 2015 +0100 wined3d: Implement WINED3DSIH_SQRT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b02cbff..6ac1b5c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2606,6 +2606,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; + case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = ""; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; @@ -6788,7 +6789,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SGN */ shader_glsl_sgn, /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, - /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem,

1 0

Matteo Bruni : wined3d: Use the proper pitch in read_from_framebuffer().
by Alexandre Julliard Feb. 11, 2015

Feb. 11, 2015

Module: wine Branch: master Commit: ac3df5e1f1d4595b5d0e9b8404025068ed79bcde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3df5e1f1d4595b5d0e9b840… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 10 20:14:49 2015 +0100 wined3d: Use the proper pitch in read_from_framebuffer(). This function is only used in the non-default "backbuffer" ORM. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8aaa82b..8f60769 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2843,7 +2843,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc } /* Setup pixel store pack state -- to glReadPixels into the correct place */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, surface->resource.width); + gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, + wined3d_surface_get_pitch(surface) / surface->resource.format->byte_count); checkGLcall("glPixelStorei"); gl_info->gl_ops.gl.p_glReadPixels(0, 0,

1 0