wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Alexandre Julliard : Release 1.7.35.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 060b778fdef1e1efd428de8b93133cd1807bfdcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=060b778fdef1e1efd428de8b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 21:06:27 2015 +0100 Release 1.7.35. --- ANNOUNCE | 604 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 279 insertions(+), 346 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060b778fdef1e1efd428d…

1 0

Andrew Eikum : wined3d: Fix spec file entry for wined3d_texture_create.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 7b45103c4ab380215a0854c5d912573ec216c659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b45103c4ab380215a0854c5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 23 10:19:20 2015 -0600 wined3d: Fix spec file entry for wined3d_texture_create. --- dlls/wined3d/wined3d.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 63e18c7..aca33f4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,7 +258,7 @@ @ cdecl wined3d_swapchain_set_window(ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) -@ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr) +@ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) @ cdecl wined3d_texture_get_autogen_filter_type(ptr)

1 0

Jacek Caban : mshtml: Added Exec(OLECMDID_OPTICAL_ZOOM) implementation.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 13d899ec0f72b413b34c44024374d5bbacd23b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d899ec0f72b413b34c44024… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 23 14:38:16 2015 +0100 mshtml: Added Exec(OLECMDID_OPTICAL_ZOOM) implementation. --- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/nsembed.c | 22 ++++++++++++++++++++++ dlls/mshtml/olecmd.c | 11 +++++++++-- dlls/mshtml/oleobj.c | 22 ++-------------------- dlls/mshtml/tests/htmldoc.c | 2 +- 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a53fcec..5c3c1ec 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -818,8 +818,9 @@ void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*) DECLSPEC_HIDD void init_nsio(nsIComponentManager*,nsIComponentRegistrar*) DECLSPEC_HIDDEN; void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; +void set_viewer_zoom(NSContainer*,float) DECLSPEC_HIDDEN; -void init_node_cc(void); +void init_node_cc(void) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2854ac3..8f3fceb 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1149,6 +1149,28 @@ BOOL is_gecko_path(const char *path) return ret; } +void set_viewer_zoom(NSContainer *nscontainer, float factor) +{ + nsIContentViewer *content_viewer; + nsIDocShell *doc_shell; + nsresult nsres; + + TRACE("Setting to %f\n", factor); + + nsres = get_nsinterface((nsISupports*)nscontainer->navigation, &IID_nsIDocShell, (void**)&doc_shell); + assert(nsres == NS_OK); + + nsres = nsIDocShell_GetContentViewer(doc_shell, &content_viewer); + assert(nsres == NS_OK && content_viewer); + nsIDocShell_Release(doc_shell); + + nsres = nsIContentViewer_SetFullZoom(content_viewer, factor); + if(NS_FAILED(nsres)) + ERR("SetFullZoom failed: %08x\n", nsres); + + nsIContentViewer_Release(content_viewer); +} + struct nsWeakReference { nsIWeakReference nsIWeakReference_iface; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 5916010..f4bf002 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -548,8 +548,15 @@ static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VA static HRESULT exec_optical_zoom(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); - return E_NOTIMPL; + TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); + + if(!pvaIn || V_VT(pvaIn) != VT_I4) { + FIXME("Unsupported argument %s\n", debugstr_variant(pvaIn)); + return E_NOTIMPL; + } + + set_viewer_zoom(This->doc_obj->nscontainer, (float)V_I4(pvaIn)/100); + return S_OK; } static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index aeb83a0..7809eb0 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -229,12 +229,9 @@ void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) static void load_settings(HTMLDocumentObj *doc) { - nsIContentViewer *content_viewer; - nsIDocShell *doc_shell; HKEY settings_key; DWORD val, size; LONG res; - nsresult nsres; static const WCHAR ie_keyW[] = { 'S','O','F','T','W','A','R','E','\\', @@ -250,23 +247,8 @@ static void load_settings(HTMLDocumentObj *doc) size = sizeof(val); res = RegGetValueW(settings_key, zoomW, zoom_factorW, RRF_RT_REG_DWORD, NULL, &val, &size); RegCloseKey(settings_key); - if(res != ERROR_SUCCESS) - return; - - TRACE("Setting ZoomFactor to %u\n", val); - - nsres = get_nsinterface((nsISupports*)doc->nscontainer->navigation, &IID_nsIDocShell, (void**)&doc_shell); - assert(nsres == NS_OK); - - nsres = nsIDocShell_GetContentViewer(doc_shell, &content_viewer); - assert(nsres == NS_OK && content_viewer); - nsIDocShell_Release(doc_shell); - - nsres = nsIContentViewer_SetFullZoom(content_viewer, (float)val/100000); - if(NS_FAILED(nsres)) - ERR("SetFullZoom failed: %08x\n", nsres); - - nsIContentViewer_Release(content_viewer); + if(res == ERROR_SUCCESS) + set_viewer_zoom(doc->nscontainer, (float)val/100000); } static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 16d6b45..3b332d1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6641,7 +6641,7 @@ static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) SET_EXPECT(GetOverrideKeyPath); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, OLECMDEXECOPT_DODEFAULT, &v, NULL); - todo_wine ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); CLEAR_CALLED(GetOverrideKeyPath); IOleCommandTarget_Release(cmdtrg);

1 0

Michael Stefaniuc : wintrust/tests: Remove an unused assignment ( PVS-Studio).
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 971cf7001471d7138ed86c417887076a92ac1ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=971cf7001471d7138ed86c417… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:49:11 2015 +0100 wintrust/tests: Remove an unused assignment (PVS-Studio). --- dlls/wintrust/tests/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 0e77f93..d7e76b1 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -790,7 +790,7 @@ static void test_create_catalog_file(void) /* Only enumerate the attributes */ trace("Only attributes\n"); - attrcount = membercount = 0; + attrcount = 0; catcdf = pCryptCATCDFOpen(cdffileW, NULL); catattr = NULL;

1 0

Michael Stefaniuc : wininet: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: b32d93a10bafa43609c6db0f06a5049dca955984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32d93a10bafa43609c6db0f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:13:57 2015 +0100 wininet: Remove an unused assignment (PVS-Studio). --- dlls/wininet/cookie.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index d2fbec3..bb1a914 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -367,7 +367,6 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) *pend = 0; data = heap_strdupAtoW(pbeg); - pbeg = pend+1; pbeg = strchr(pend+1, '\n'); if(!pbeg) break;

1 0

Michael Stefaniuc : winex11.drv: Remove an unused assignment (PVS-Studio).
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: f256e1476c9ce9262ff252107f72782cab84f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f256e1476c9ce9262ff252107… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:13:17 2015 +0100 winex11.drv: Remove an unused assignment (PVS-Studio). --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e9670c3..58e66d6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -163,7 +163,7 @@ static LONG xrandr10_set_current_mode( int mode ) root = DefaultRootWindow( gdi_display ); sc = pXRRGetScreenInfo (gdi_display, root); - size = pXRRConfigCurrentConfiguration (sc, &rot); + pXRRConfigCurrentConfiguration (sc, &rot); mode = mode % xrandr_mode_count; TRACE("Changing Resolution to %dx%d @%d Hz\n",

1 0

Matteo Bruni : wined3d: Use the core version of the shader object functions.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: d360a51f3cb01d277b7438e5e04ce41f1228903b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d360a51f3cb01d277b7438e5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:43 2015 +0100 wined3d: Use the core version of the shader object functions. --- dlls/wined3d/directx.c | 93 +++++++++- dlls/wined3d/glsl_shader.c | 454 ++++++++++++++++++++++----------------------- 2 files changed, 319 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d360a51f3cb01d277b743…

1 0

Matteo Bruni : wined3d: Use the core version of GL vertex attribute functions where possible.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: e192939652f396292283f05034b10b6c2d13d334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e192939652f396292283f0503… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:42 2015 +0100 wined3d: Use the core version of GL vertex attribute functions where possible. --- dlls/wined3d/directx.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 73 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e192939652f396292283f…

1 0

Matteo Bruni : wined3d: Properly initialize the last two components of R16G16_SINT attributes.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 584892b6923a8b3d772435c1982dcc9981a13603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584892b6923a8b3d772435c19… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 22 17:41:41 2015 +0100 wined3d: Properly initialize the last two components of R16G16_SINT attributes. --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 12b03f6..4812143 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -377,7 +377,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, break; case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); + GL_EXTCALL(glVertexAttrib2svARB(index, ptr)); break; case WINED3DFMT_R16G16B16A16_SINT: GL_EXTCALL(glVertexAttrib4svARB(index, ptr)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c204ca..7cac2dc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4297,7 +4297,7 @@ static void load_numbered_arrays(struct wined3d_context *context, break; case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib4svARB(i, (const GLshort *)ptr)); + GL_EXTCALL(glVertexAttrib2svARB(i, (const GLshort *)ptr)); break; case WINED3DFMT_R16G16B16A16_SINT: GL_EXTCALL(glVertexAttrib4svARB(i, (const GLshort *)ptr));

1 0

Charles Davis : msvcrt: Support 64-bit platforms that don' t have finitef or isnanf.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 7ef720f1840ea817d8a9bcc8da2843ec66a510fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef720f1840ea817d8a9bcc8d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:30:57 2015 -0700 msvcrt: Support 64-bit platforms that don't have finitef or isnanf. --- configure | 2 ++ configure.ac | 2 ++ dlls/msvcrt/math.c | 12 ++++++++++++ include/config.h.in | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/configure b/configure index c0aa93e..b6660bd 100755 --- a/configure +++ b/configure @@ -14671,6 +14671,7 @@ for ac_func in \ dlopen \ epoll_create \ ffs \ + finitef \ fnmatch \ fork \ fpclass \ @@ -14687,6 +14688,7 @@ for ac_func in \ gettimeofday \ getuid \ if_nameindex \ + isnanf \ kqueue \ lstat \ memmove \ diff --git a/configure.ac b/configure.ac index ab8945a..b40fde4 100644 --- a/configure.ac +++ b/configure.ac @@ -2045,6 +2045,7 @@ AC_CHECK_FUNCS(\ dlopen \ epoll_create \ ffs \ + finitef \ fnmatch \ fork \ fpclass \ @@ -2061,6 +2062,7 @@ AC_CHECK_FUNCS(\ gettimeofday \ getuid \ if_nameindex \ + isnanf \ kqueue \ lstat \ memmove \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 284924a..acac35d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -34,6 +34,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +#ifndef HAVE_FINITEF +#define finitef(x) isfinite(x) +#endif + +#ifndef HAVE_ISNANF +#ifdef HAVE_ISNAN +#define isnanf(x) isnan(x) +#else +#define isnanf(x) 0 +#endif +#endif + #ifndef signbit #define signbit(x) 0 #endif diff --git a/include/config.h.in b/include/config.h.in index a8ae6c5..4d7c7ac 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -123,6 +123,9 @@ /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS +/* Define to 1 if you have the `finitef' function. */ +#undef HAVE_FINITEF + /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H @@ -279,6 +282,9 @@ /* Define to 1 if you have the `isnan' function. */ #undef HAVE_ISNAN +/* Define to 1 if you have the `isnanf' function. */ +#undef HAVE_ISNANF + /* Define to 1 if you have the <jpeglib.h> header file. */ #undef HAVE_JPEGLIB_H

1 0

← Newer
1
2
3
4
5
6
7
...
31
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 January 2015