March 2015 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Handle large input rect in GdipMeasureCharacterRanges.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 6b97abf930ac40dd9a668ec1fed588fcefd192fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b97abf930ac40dd9a668ec1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 23 15:12:06 2015 -0500 gdiplus: Handle large input rect in GdipMeasureCharacterRanges. --- dlls/gdiplus/graphics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 34022cb..ae530a9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4739,6 +4739,9 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont);

1 0

Michael Stefaniuc : schedsvc: Drop WINE_ prefix from ERR().
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 6f6aa9b8a6f41e50f2f4e92c6ade72a03453e23c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6aa9b8a6f41e50f2f4e92c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:05:49 2015 +0100 schedsvc: Drop WINE_ prefix from ERR(). --- dlls/schedsvc/svc_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8c451c9..b559311 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -129,35 +129,35 @@ static RPC_STATUS RPC_init(void) status = RpcServerUseProtseqEpW(transport, 0, NULL, NULL); if (status != RPC_S_OK) { - WINE_ERR("RpcServerUseProtseqEp error %#x\n", status); + ERR("RpcServerUseProtseqEp error %#x\n", status); return status; } status = RpcServerRegisterIf(ITaskSchedulerService_v1_0_s_ifspec, 0, 0); if (status != RPC_S_OK) { - WINE_ERR("RpcServerRegisterIf error %#x\n", status); + ERR("RpcServerRegisterIf error %#x\n", status); return status; } status = RpcServerInqBindings(&sched_bindings); if (status != RPC_S_OK) { - WINE_ERR("RpcServerInqBindings error %#x\n", status); + ERR("RpcServerInqBindings error %#x\n", status); return status; } status = RpcEpRegisterW(ITaskSchedulerService_v1_0_s_ifspec, sched_bindings, NULL, NULL); if (status != RPC_S_OK) { - WINE_ERR("RpcEpRegister error %#x\n", status); + ERR("RpcEpRegister error %#x\n", status); return status; } status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); if (status != RPC_S_OK) { - WINE_ERR("RpcServerListen error %#x\n", status); + ERR("RpcServerListen error %#x\n", status); return status; } return RPC_S_OK; @@ -180,7 +180,7 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); if (!schedsvc_handle) { - WINE_ERR("RegisterServiceCtrlHandler error %d\n", GetLastError()); + ERR("RegisterServiceCtrlHandler error %d\n", GetLastError()); return; }

1 0

Michael Stefaniuc : mshtml: Print the debug string instead of the pointer value.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: a21b2cc5b90612c9c334f101d57b2b7c97ce4076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21b2cc5b90612c9c334f101d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 09:59:33 2015 +0100 mshtml: Print the debug string instead of the pointer value. --- dlls/mshtml/htmlstyle3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 9355bd0..f8c7466 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -560,7 +560,7 @@ static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - TRACE("(%p)->(%p)\n", This, debugstr_variant(p)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(p)); return get_nsstyle_attr_var(This->nsstyle, STYLEID_MAX_HEIGHT, p, 0); }

1 0

Michael Stefaniuc : mscoree: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 60d54eee93b0bc218a61cb6a9383322430811853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d54eee93b0bc218a61cb6a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 09:52:20 2015 +0100 mscoree: Use SUCCEEDED instead of !FAILED. --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 6a037f8..87f1d32 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1318,7 +1318,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) goto cleanup; hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { /* * The registry doesn't have a CodeBase entry and it's not in the GAC.

1 0

Mark Harmstone : comctl32: Use correct font for themed headers.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: e7116725ff6bd082ffd97ad0b3813ab2104ea618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7116725ff6bd082ffd97ad0b… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 24 07:40:59 2015 +0000 comctl32: Use correct font for themed headers. --- dlls/comctl32/header.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 59f2c12..7c632f3 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -333,6 +333,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU INT oldBkMode; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); NMCUSTOMDRAW nmcd; + int state = 0; TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, (infoPtr->nNotifyFormat == NFR_UNICODE)); @@ -340,6 +341,9 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (r.right - r.left == 0) return phdi->rect.right; + if (theme) + state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); + /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); SetBkColor(hdc, comctl32_color.clr3dFace); @@ -418,8 +422,14 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU RECT textRect; SetRectEmpty(&textRect); - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); + + if (theme) { + GetThemeTextExtent(theme, hdc, HP_HEADERITEM, state, phdi->pszText, -1, + DT_LEFT|DT_VCENTER|DT_SINGLELINE, NULL, &textRect); + } else { + DrawTextW (hdc, phdi->pszText, -1, + &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); + } cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; } @@ -512,8 +522,14 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU oldBkMode = SetBkMode(hdc, TRANSPARENT); r.left = tx; r.right = tx + tw; - DrawTextW (hdc, phdi->pszText, -1, - &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); + if (theme) { + DrawThemeText(theme, hdc, HP_HEADERITEM, state, phdi->pszText, + -1, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE, + 0, &r); + } else { + DrawTextW (hdc, phdi->pszText, -1, + &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); + } if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); }

1 0

David Naylor : configure: Recognise host starting in 'amd64'.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: aec36fe2d5a723da618ac90cbb208582d8f8b79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec36fe2d5a723da618ac90cb… Author: David Naylor <dbn(a)freebsd.org> Date: Sun Mar 22 20:20:59 2015 +0200 configure: Recognise host starting in 'amd64'. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5f5e9d5..af78958 100755 --- a/configure +++ b/configure @@ -4864,7 +4864,7 @@ case $host in fi with_fontconfig=${with_fontconfig:-no} ;; - x86_64*) + x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then CC="$CC -m32" diff --git a/configure.ac b/configure.ac index d23227a..d04780c 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,7 @@ case $host in fi with_fontconfig=${with_fontconfig:-no} ;; - x86_64*) + x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then CC="$CC -m32"

1 0

Michael Stefaniuc : fntcache: Drop WINE_ prefix from FIXME/TRACE.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 01eed947ebe300c24af60974c8ce6d6571cd412b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01eed947ebe300c24af60974c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:06:44 2015 +0100 fntcache: Drop WINE_ prefix from FIXME/TRACE. --- dlls/fntcache/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 91c20e0..8de84b2 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -64,14 +64,14 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d { case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN: - WINE_TRACE( "shutting down\n" ); + TRACE( "shutting down\n" ); status.dwCurrentState = SERVICE_STOP_PENDING; status.dwControlsAccepted = 0; SetServiceStatus( service_handle, &status ); SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + FIXME( "got service ctrl %x\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR; @@ -86,7 +86,7 @@ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) static const WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e',0}; SERVICE_STATUS status; - WINE_TRACE( "starting service\n" ); + TRACE( "starting service\n" ); stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -108,5 +108,5 @@ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) status.dwCurrentState = SERVICE_STOPPED; status.dwControlsAccepted = 0; SetServiceStatus( service_handle, &status ); - WINE_TRACE( "service stopped\n" ); + TRACE( "service stopped\n" ); }

1 0

Michael Stefaniuc : qcap: Print the debug string instead of the pointer value.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: f7a21ee1d748bebe9c6074f0f01a3e01f52ff68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a21ee1d748bebe9c6074f0f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:01:26 2015 +0100 qcap: Print the debug string instead of the pointer value. --- dlls/qcap/avimux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 0a73942..44a032a 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1015,7 +1015,7 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat( IMediaSeeking *iface, const GUID *pFormat) { AviMux *This = impl_from_IMediaSeeking(iface); - FIXME("(%p)->(%p)\n", This, debugstr_guid(pFormat)); + FIXME("(%p)->(%s)\n", This, debugstr_guid(pFormat)); return E_NOTIMPL; }

1 0

Michael Stefaniuc : taskschd: Print the debug string instead of the pointer value.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 87cfceb8bf76100e5285583792fe90c0c662f244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cfceb8bf76100e528558379… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 09:56:00 2015 +0100 taskschd: Print the debug string instead of the pointer value. --- dlls/taskschd/task.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d1bc7eb..5a7ade8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -137,7 +137,7 @@ static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(description)); + TRACE("%p,%s\n", iface, debugstr_w(description)); if (!description) return E_INVALIDARG; @@ -163,7 +163,7 @@ static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(author)); + TRACE("%p,%s\n", iface, debugstr_w(author)); if (!author) return E_INVALIDARG; @@ -189,7 +189,7 @@ static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BST { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(version)); + TRACE("%p,%s\n", iface, debugstr_w(version)); if (!version) return E_INVALIDARG; @@ -215,7 +215,7 @@ static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR d { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(date)); + TRACE("%p,%s\n", iface, debugstr_w(date)); if (!date) return E_INVALIDARG; @@ -241,7 +241,7 @@ static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *ifac { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(doc)); + TRACE("%p,%s\n", iface, debugstr_w(doc)); if (!doc) return E_INVALIDARG; @@ -259,7 +259,7 @@ static HRESULT WINAPI RegistrationInfo_get_XmlText(IRegistrationInfo *iface, BST static HRESULT WINAPI RegistrationInfo_put_XmlText(IRegistrationInfo *iface, BSTR xml) { - FIXME("%p,%p: stub\n", iface, debugstr_w(xml)); + FIXME("%p,%s: stub\n", iface, debugstr_w(xml)); return E_NOTIMPL; } @@ -279,7 +279,7 @@ static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR ur { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(uri)); + TRACE("%p,%s\n", iface, debugstr_w(uri)); if (!uri) return E_INVALIDARG; @@ -297,7 +297,7 @@ static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo static HRESULT WINAPI RegistrationInfo_put_SecurityDescriptor(IRegistrationInfo *iface, VARIANT sddl) { - FIXME("%p,%p: stub\n", iface, debugstr_variant(&sddl)); + FIXME("%p,%s: stub\n", iface, debugstr_variant(&sddl)); return E_NOTIMPL; } @@ -317,7 +317,7 @@ static HRESULT WINAPI RegistrationInfo_put_Source(IRegistrationInfo *iface, BSTR { registration_info *reginfo = impl_from_IRegistrationInfo(iface); - TRACE("%p,%p\n", iface, debugstr_w(source)); + TRACE("%p,%s\n", iface, debugstr_w(source)); if (!source) return E_INVALIDARG;

1 0

Henri Verbeet : wined3d: Add support for SV_InstanceID.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: a33d3ad41bcbf3637fdb5506946c932856f8c07a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33d3ad41bcbf3637fdb55069… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:25 2015 +0100 wined3d: Add support for SV_InstanceID. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- include/wine/wined3d.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a61d268..6e3b535 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1182,11 +1182,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - /* Declare attributes. */ - for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) + for (i = 0; i < shader->input_signature.element_count; ++i) { - if (map & 1) - shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, i); + const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; + if (e->sysval_semantic == WINED3D_SV_INSTANCEID) + shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", + prefix, e->register_idx); + else + shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, e->register_idx); } shader_addline(buffer, "uniform vec4 posFixup;\n"); @@ -4588,6 +4591,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); + if (gl_info->supported[ARB_DRAW_INSTANCED]) + shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dcf7212..116918d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -768,6 +768,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_INSTANCEID = 8, WINED3D_SV_DEPTH = 0xffffffff, WINED3D_SV_TARGET0 = 0,

1 0