January 2017 - Wine-Commits

Jacek Caban : mshtml: Added MHTMLDocument object class factory stub implementation.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 0e8c7bece60d4c1ea51ebdab81de309851f13f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8c7bece60d4c1ea51ebdab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 11:56:40 2017 +0100 mshtml: Added MHTMLDocument object class factory stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 ++++++ dlls/mshtml/main.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + include/mshtml.idl | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index cf9344f..b409e7d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5105,3 +5105,9 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) return S_OK; } + +HRESULT MHTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + return E_NOTIMPL; +} diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 2a00aee..ad6bb2b 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -339,6 +339,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLDocument_Create); + }else if(IsEqualGUID(&CLSID_MHTMLDocument, rclsid)) { + TRACE("(CLSID_MHTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); + return ClassFactory_Create(riid, ppv, MHTMLDocument_Create); }else if(IsEqualGUID(&CLSID_AboutProtocol, rclsid)) { TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); @@ -441,7 +444,6 @@ DEFINE_GUID(CLSID_HTMLServerDoc, 0x3050F4E7, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA DEFINE_GUID(CLSID_IImageDecodeFilter, 0x607FD4E8, 0x0A03, 0x11D1, 0xAB,0x1D, 0x00,0xC0,0x4F,0xC9,0xB3,0x04); DEFINE_GUID(CLSID_IImgCtx, 0x3050F3D6, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_IntDitherer, 0x05F6FE1A, 0xECEF, 0x11D0, 0xAA,0xE7, 0x00,0xC0,0x4F,0xC9,0xB3,0x04); -DEFINE_GUID(CLSID_MHTMLDocument, 0x3050F3D9, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_TridentAPI, 0x429AF92C, 0xA51F, 0x11D2, 0x86,0x1E, 0x00,0xC0,0x4F,0xA3,0x5C,0x89); #define INF_SET_ID(id) \ diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1d4dcc5..5a559ea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -823,6 +823,7 @@ struct HTMLDocumentNode { }; HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT MHTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; diff --git a/include/mshtml.idl b/include/mshtml.idl index f004f39..cbcb44f 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -33,6 +33,8 @@ import "dispex.idl"; cpp_quote("#include <olectl.h>") +cpp_quote("DEFINE_GUID(CLSID_MHTMLDocument, 0x3050f3d9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") + cpp_quote("DEFINE_GUID(SID_SEditCommandTarget, 0x3050f4b5,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("DEFINE_GUID(SID_SHTMLEditHost, 0x3050f6a0,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);")

1 0

Jacek Caban : urlmon: Added Seek implementations for streams using cache file.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 32671b1d2f7b1d92264abd76b67fbb0985f86607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32671b1d2f7b1d92264abd76b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 11:52:59 2017 +0100 urlmon: Added Seek implementations for streams using cache file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 36 ++++++++++++++++++++++++++++++++-- dlls/urlmon/tests/url.c | 51 +++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 9b78582..88b3c1c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -520,8 +520,40 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); - return E_NOTIMPL; + LARGE_INTEGER new_pos; + DWORD method; + + TRACE("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + + if(This->buf->file == INVALID_HANDLE_VALUE) { + /* We should probably call protocol handler's Seek. */ + FIXME("no cache file, not supported\n"); + return E_FAIL; + } + + switch(dwOrigin) { + case STREAM_SEEK_SET: + method = FILE_BEGIN; + break; + case STREAM_SEEK_CUR: + method = FILE_CURRENT; + break; + case STREAM_SEEK_END: + method = FILE_END; + break; + default: + WARN("Invalid origin %x\n", dwOrigin); + return E_FAIL; + } + + if(!SetFilePointerEx(This->buf->file, dlibMove, &new_pos, method)) { + FIXME("SetFilePointerEx failed: %u\n", GetLastError()); + return E_FAIL; + } + + if(plibNewPosition) + plibNewPosition->QuadPart = new_pos.QuadPart; + return S_OK; } static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9ccd8ef..cd1d855 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1949,6 +1949,31 @@ static HRESULT WINAPI statusclb_GetBindInfo(IBindStatusCallbackEx *iface, DWORD return S_OK; } +static void test_stream_seek(IStream *stream) +{ + ULARGE_INTEGER new_pos; + LARGE_INTEGER pos; + HRESULT hres; + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, STREAM_SEEK_SET, &new_pos); + ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(!new_pos.QuadPart, "new_pos.QuadPart != 0\n"); + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, STREAM_SEEK_END, &new_pos); + ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(new_pos.QuadPart, "new_pos.QuadPart = 0\n"); + + pos.QuadPart = 0; + new_pos.QuadPart = 0xdeadbeef; + hres = IStream_Seek(stream, pos, 100, &new_pos); + ok(hres == E_FAIL, "Seek failed: %08x\n", hres); + ok(new_pos.QuadPart == 0xdeadbeef, "unexpected new_pos.QuadPart\n"); +} + static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { @@ -1995,24 +2020,28 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n"); switch(pstgmed->tymed) { - case TYMED_ISTREAM: + case TYMED_ISTREAM: { + IStream *stream = U(*pstgmed).pstm; + + ok(stream != NULL, "U(*pstgmed).pstm == NULL\n"); + if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) { STATSTG stat; - hres = IStream_Write(U(*pstgmed).pstm, buf, 10, NULL); + hres = IStream_Write(stream, buf, 10, NULL); ok(hres == STG_E_ACCESSDENIED, "Write failed: %08x, expected STG_E_ACCESSDENIED\n", hres); - hres = IStream_Commit(U(*pstgmed).pstm, 0); + hres = IStream_Commit(stream, 0); ok(hres == E_NOTIMPL, "Commit failed: %08x, expected E_NOTIMPL\n", hres); - hres = IStream_Revert(U(*pstgmed).pstm); + hres = IStream_Revert(stream); ok(hres == E_NOTIMPL, "Revert failed: %08x, expected E_NOTIMPL\n", hres); - hres = IStream_Stat(U(*pstgmed).pstm, NULL, STATFLAG_NONAME); + hres = IStream_Stat(stream, NULL, STATFLAG_NONAME); ok(hres == E_FAIL, "hres = %x\n", hres); if(use_cache_file && emulate_protocol) { - hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_DEFAULT); + hres = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); ok(hres == S_OK, "hres = %x\n", hres); ok(!lstrcmpW(stat.pwcsName, cache_file_name), "stat.pwcsName = %s, cache_file_name = %s\n", @@ -2021,7 +2050,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(U(stat.cbSize).LowPart == (bindf&BINDF_ASYNCHRONOUS?0:6500), "stat.cbSize.LowPart = %u\n", U(stat.cbSize).LowPart); } else { - hres = IStream_Stat(U(*pstgmed).pstm, &stat, STATFLAG_NONAME); + hres = IStream_Stat(stream, &stat, STATFLAG_NONAME); ok(hres == S_OK, "hres = %x\n", hres); ok(!stat.pwcsName || broken(stat.pwcsName!=NULL), "stat.pwcsName = %s\n", wine_dbgstr_w(stat.pwcsName)); @@ -2034,17 +2063,19 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW ok(stat.reserved == 0, "stat.reserved = %x\n", stat.reserved); } - ok(U(*pstgmed).pstm != NULL, "U(*pstgmed).pstm == NULL\n"); if(callback_read) { do { - hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + hres = IStream_Read(stream, buf, 512, &readed); if(test_protocol == HTTP_TEST && emulate_protocol && readed) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } - break; + if(use_cache_file && (grfBSCF & BSCF_FIRSTDATANOTIFICATION) && !(bindf & BINDF_PULLDATA)) + test_stream_seek(stream); + break; + } case TYMED_FILE: if(test_protocol == FILE_TEST) ok(!lstrcmpW(pstgmed->u.lpszFileName, file_url+7),

1 0

Józef Kucia : ddraw: Relax "dwSize" validation in ddraw_surface*_Lock().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 2bef0eafd03430189e88f535ffa3d3b9a981b678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bef0eafd03430189e88f535f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 17 12:26:37 2017 +0100 ddraw: Relax "dwSize" validation in ddraw_surface*_Lock(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 6 +-- dlls/ddraw/surface.c | 91 ++++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 4 -- 3 files changed, 54 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2bef0eafd03430189e88f…

1 0

Nikolay Sivov : d2d1: Fix ID2D1HwndRenderTarget::Resize() prototype.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 6ab887c057df4a11b2be8aa9eff209a2cd6b144c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab887c057df4a11b2be8aa9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:47:37 2017 +0300 d2d1: Fix ID2D1HwndRenderTarget::Resize() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/hwnd_render_target.c | 6 +++--- include/d2d1.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index e9092b6..4f68afd 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -672,17 +672,17 @@ static D2D1_WINDOW_STATE STDMETHODCALLTYPE d2d_hwnd_render_target_CheckWindowSta DXGI_STATUS_OCCLUDED ? D2D1_WINDOW_STATE_OCCLUDED : D2D1_WINDOW_STATE_NONE; } -static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTarget *iface, const D2D1_SIZE_U size) +static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTarget *iface, const D2D1_SIZE_U *size) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); IDXGISurface1 *dxgi_surface; HRESULT hr; - TRACE("iface %p, width %u, height %u.\n", iface, size.width, size.height); + TRACE("iface %p, width %u, height %u.\n", iface, size->width, size->height); d2d_d3d_render_target_create_rtv(render_target->dxgi_target, NULL); - if (SUCCEEDED(hr = IDXGISwapChain_ResizeBuffers(render_target->swapchain, 1, size.width, size.height, + if (SUCCEEDED(hr = IDXGISwapChain_ResizeBuffers(render_target->swapchain, 1, size->width, size->height, DXGI_FORMAT_UNKNOWN, 0))) { if (FAILED(hr = IDXGISwapChain_GetBuffer(render_target->swapchain, 0, &IID_IDXGISurface1, diff --git a/include/d2d1.idl b/include/d2d1.idl index 7a903ca..4a62f7c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1148,7 +1148,7 @@ interface ID2D1HwndRenderTarget : ID2D1RenderTarget { D2D1_WINDOW_STATE CheckWindowState(); HRESULT Resize( - [in] const D2D1_SIZE_U size + [in] const D2D1_SIZE_U *size ); HWND GetHwnd(); }

1 0

Józef Kucia : wined3d: Remove inaccurate comments.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 0c2479e355ff8b36959e095c6ac2ff25c8f01b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2479e355ff8b36959e095c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 25 11:18:00 2017 +0100 wined3d: Remove inaccurate comments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f053f55..8bd4cb5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4573,9 +4573,6 @@ static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) } } -/********************************************* - * Pixel Shader Specific Code begins here - ********************************************/ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) { DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, @@ -5577,10 +5574,6 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w } } -/********************************************* - * Vertex Shader Specific Code begins here - ********************************************/ - static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_shader_prog_link *entry) { struct glsl_program_key key;

1 0

Masanori Kakura : winegstreamer: Avoid zero division in amt_from_gst_caps_video().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 442653b94ef21fad97a6cd82fe01bc95a79a52a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442653b94ef21fad97a6cd82f… Author: Masanori Kakura <kakurasan(a)gmail.com> Date: Wed Jan 25 23:02:20 2017 +0900 winegstreamer: Avoid zero division in amt_from_gst_caps_video(). Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c33ed9e..759a5db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -233,9 +233,8 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) bih->biCompression = amt->subtype.Data1; } bih->biSizeImage = width * height * bih->biBitCount / 8; - vih->AvgTimePerFrame = 10000000; - vih->AvgTimePerFrame *= denom; - vih->AvgTimePerFrame /= nom; + if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) + vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ vih->rcSource.left = 0; vih->rcSource.right = width; vih->rcSource.top = height;

1 0

Huw Davies : schedsvc/tests: Early versions of Windows 10 return S_OK whether or not the element exists.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: bdec0b20317b413514663c041ceac7f206ea4692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdec0b20317b413514663c041… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 23 11:01:46 2017 +0000 schedsvc/tests: Early versions of Windows 10 return S_OK whether or not the element exists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 7aeea17..044118e 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -148,7 +148,9 @@ START_TEST(rpcapi) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = SchRpcDelete(Wine, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || + broken(hr == S_OK), /* Early versions of Win 10 */ + "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = SchRpcDelete(empty, 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#x\n", hr);

1 0

Nikolay Sivov : dwrite: Use OpenType 1.8 'hhea' table structure.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 669d033ee160dfe3dd76e9ee14cc6868d10d90a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=669d033ee160dfe3dd76e9ee1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:54:14 2017 +0300 dwrite: Use OpenType 1.8 'hhea' table structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 3 ++- dlls/dwrite/tests/font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index f4ed51f..7a3e641 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -205,7 +205,8 @@ typedef struct } TT_OS2_V2; typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; SHORT ascender; SHORT descender; SHORT linegap; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9382569..c373d14 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -217,7 +217,8 @@ typedef struct { } TT_POST; typedef struct { - ULONG version; + USHORT majorVersion; + USHORT minorVersion; SHORT ascender; SHORT descender; SHORT linegap;

1 0

Henri Verbeet : ddraw: Kill stray tabs.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 31fcbb6bf2fc65ec5e6b1ac735c6a043b85b5a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fcbb6bf2fc65ec5e6b1ac73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:28 2017 +0100 ddraw: Kill stray tabs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 75 ++++++++++++++++++++++------------------------ dlls/ddraw/main.c | 6 ---- 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 09226cd..98e9404 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -75,12 +75,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, for (;;) { D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; - BYTE size; - WORD count; - - count = current->wCount; - size = current->bSize; - instr += sizeof(D3DINSTRUCTION); + BYTE size; + WORD count; + + count = current->wCount; + size = current->bSize; + instr += sizeof(*current); primitive_size = 0; switch (current->bOpcode) @@ -203,10 +203,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; } - case D3DOP_MATRIXLOAD: - WARN("MATRIXLOAD-s (%d)\n", count); - instr += count * size; - break; + case D3DOP_MATRIXLOAD: + WARN("MATRIXLOAD-s (%u)\n", count); + instr += count * size; + break; case D3DOP_MATRIXMULTIPLY: TRACE("MATRIXMULTIPLY (%d)\n", count); @@ -351,19 +351,15 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - case D3DOP_TEXTURELOAD: { - WARN("TEXTURELOAD-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_TEXTURELOAD: + WARN("TEXTURELOAD-s (%u)\n", count); + instr += count * size; + break; - case D3DOP_EXIT: { - TRACE("EXIT (%d)\n", count); - /* We did this instruction */ - instr += size; - /* Exit this loop */ - goto end_of_buffer; - } break; + case D3DOP_EXIT: + TRACE("EXIT (%u)\n", count); + instr += size; + goto end_of_buffer; case D3DOP_BRANCHFORWARD: TRACE("BRANCHFORWARD (%d)\n", count); @@ -380,26 +376,28 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr = (char*)current + ci->dwOffset; break; } - } - } else { - if (ci->bNegate) { + } + } + else + { + if (ci->bNegate) + { TRACE(" Branch to %d\n", ci->dwOffset); if (ci->dwOffset) { instr = (char*)current + ci->dwOffset; break; } - } - } + } + } - instr += size; + instr += size; } break; - case D3DOP_SPAN: { - WARN("SPAN-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_SPAN: + WARN("SPAN-s (%u)\n", count); + instr += count * size; + break; case D3DOP_SETSTATUS: TRACE("SETSTATUS (%d)\n", count); @@ -410,12 +408,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - default: - ERR("Unhandled OpCode %d !!!\n",current->bOpcode); - /* Try to save ... */ - instr += count * size; - break; - } + default: + ERR("Unhandled OpCode %#x.\n",current->bOpcode); + instr += count * size; + break; + } } end_of_buffer: diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index bb9e37f..4c94dd1 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -748,17 +748,11 @@ HRESULT WINAPI DllCanUnloadNow(void) } -/*********************************************************************** - * DllRegisterServer (DDRAW.@) - */ HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); } -/*********************************************************************** - * DllUnregisterServer (DDRAW.@) - */ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance );

1 0

Henri Verbeet : wined3d: Get rid of a superfluous floatBitsToUint() in shader_glsl_texkill().
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 87c6ac4258bb7b741d4a5eff950807ca1a3e0d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c6ac4258bb7b741d4a5eff9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:24 2017 +0100 wined3d: Get rid of a superfluous floatBitsToUint() in shader_glsl_texkill(). shader_glsl_add_src_param() already adds floatBitsToUint(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8d208e..40bbfdc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5450,7 +5450,7 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(floatBitsToUint(%s))) discard;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) discard;\n", src_param.param_str); } else {

1 0