December 2012 - Wine-Commits

Jacek Caban : itss: Fixed fragment part handling in IInternetProtocolInfo:: CombineUrl.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 60195ff6a963a6842df77697b78ae7d0c32d5a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60195ff6a963a6842df77697b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 18:38:40 2012 +0100 itss: Fixed fragment part handling in IInternetProtocolInfo::CombineUrl. --- dlls/itss/protocol.c | 4 +++- dlls/itss/tests/protocol.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 6b188c6..1463518 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -469,7 +469,9 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, if(strchrW(pwzRelativeUrl, ':')) return STG_E_INVALIDNAME; - if(pwzRelativeUrl[0] != '/') { + if(pwzRelativeUrl[0] == '#') { + base_end += strlenW(base_end); + }else if(pwzRelativeUrl[0] != '/') { ptr = strrchrW(base_end, '/'); if(ptr) base_end = ptr+1; diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 133a8bf..6fd3431 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -483,6 +483,12 @@ static const struct { {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, + {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, + {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, + {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol)

1 0

Huw Davies : riched20: Flush the output buffer before a codepage change.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 368f9123c9e465e2f212e35ee5c920847c73b5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=368f9123c9e465e2f212e35ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 5 14:17:53 2012 +0000 riched20: Flush the output buffer before a codepage change. --- dlls/riched20/reader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 9f88cf7..02d4636 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2397,8 +2397,11 @@ CharAttr(RTF_Info *info) font = RTFGetFont(info, info->rtfParam); if (font) { - if (info->ansiCodePage != CP_UTF8) + if (info->ansiCodePage != CP_UTF8 && info->codePage != font->rtfFCodePage) + { + RTFFlushOutputBuffer(info); info->codePage = font->rtfFCodePage; + } TRACE("font %d codepage %d\n", info->rtfParam, info->codePage); } else

1 0

Alexandre Julliard : gdi32: Support getting character codes instead of glyphs in ExtTextOut for the path driver .
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 491123e17bfb80ccac2a37771ebb257652efc076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491123e17bfb80ccac2a37771… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 17:32:35 2012 +0100 gdi32: Support getting character codes instead of glyphs in ExtTextOut for the path driver. --- dlls/gdi32/path.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 38210ca..2c54e94 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1511,10 +1511,11 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC LPCWSTR str, UINT count, const INT *dx ) { struct path_physdev *physdev = get_path_physdev( dev ); - unsigned int idx; + unsigned int idx, ggo_flags = GGO_NATIVE; POINT offset = {0, 0}; if (!count) return TRUE; + if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX; for (idx = 0; idx < count; idx++) { @@ -1523,8 +1524,7 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC DWORD dwSize; void *outline; - dwSize = GetGlyphOutlineW(dev->hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, - &gm, 0, NULL, &identity); + dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity); if (dwSize == GDI_ERROR) return FALSE; /* add outline only if char is printable */ @@ -1533,9 +1533,7 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC outline = HeapAlloc(GetProcessHeap(), 0, dwSize); if (!outline) return FALSE; - GetGlyphOutlineW(dev->hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, - &gm, dwSize, outline, &identity); - + GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, dwSize, outline, &identity); PATH_add_outline(physdev, x + offset.x, y + offset.y, outline, dwSize); HeapFree(GetProcessHeap(), 0, outline);

1 0

Detlef Riekenberg : shell32: Fix DoEnvironmentSubstA implementation.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 1708adeb97298a3edd5a15f5f72e01fd6619fe51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1708adeb97298a3edd5a15f5f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 4 11:38:01 2012 +0100 shell32: Fix DoEnvironmentSubstA implementation. --- dlls/shell32/shellord.c | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index b71d213..fcad032 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1590,39 +1590,33 @@ BOOL WINAPI SHValidateUNC (HWND hwndOwner, PWSTR pszFile, UINT fConnect) } /************************************************************************ - * DoEnvironmentSubstA [SHELL32.@] + * DoEnvironmentSubstA [SHELL32.@] * - * Replace %KEYWORD% in the str with the value of variable KEYWORD - * from environment. If it is not found the %KEYWORD% is left - * intact. If the buffer is too small, str is not modified. - * - * PARAMS - * pszString [I] '\0' terminated string with %keyword%. - * [O] '\0' terminated string with %keyword% substituted. - * cchString [I] size of str. - * - * RETURNS - * cchString length in the HIWORD; - * TRUE in LOWORD if subst was successful and FALSE in other case + * See DoEnvironmentSubstW. */ DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) { LPSTR dst; BOOL res = FALSE; - FIXME("(%s, %d) stub\n", debugstr_a(pszString), cchString); - if (pszString == NULL) /* Really return 0? */ - return 0; + DWORD len = cchString; + + TRACE("(%s, %d)\n", debugstr_a(pszString), cchString); + if ((dst = HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(CHAR)))) { - DWORD num = ExpandEnvironmentStringsA(pszString, dst, cchString); - if (num && num < cchString) /* dest buffer is too small */ + len = ExpandEnvironmentStringsA(pszString, dst, cchString); + /* len includes the terminating 0 */ + if (len && len < cchString) { res = TRUE; - memcpy(pszString, dst, num); + memcpy(pszString, dst, len); } + else + len = cchString; + HeapFree(GetProcessHeap(), 0, dst); } - return MAKELONG(res,cchString); /* Always cchString? */ + return MAKELONG(len, res); } /************************************************************************

1 0

Rico Schüller : d3dx9: Improve D3DXMatrixRotationYawPitchRoll().
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 2cb1372350dd93abf7e06a4fb4f5521c9b7a85fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb1372350dd93abf7e06a4fb… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 4 22:10:46 2012 +0100 d3dx9: Improve D3DXMatrixRotationYawPitchRoll(). --- dlls/d3dx9_36/math.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index e09dbec..54dda6e 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -631,20 +631,37 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) return pout; } -D3DXMATRIX* WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) +D3DXMATRIX * WINAPI D3DXMatrixRotationYawPitchRoll(D3DXMATRIX *out, FLOAT yaw, FLOAT pitch, FLOAT roll) { - D3DXMATRIX m; + FLOAT sroll, croll, spitch, cpitch, syaw, cyaw; - TRACE("(%p, %f, %f, %f)\n", pout, yaw, pitch, roll); + TRACE("out %p, yaw %f, pitch %f, roll %f\n", out, yaw, pitch, roll); - D3DXMatrixIdentity(pout); - D3DXMatrixRotationZ(&m, roll); - D3DXMatrixMultiply(pout, pout, &m); - D3DXMatrixRotationX(&m, pitch); - D3DXMatrixMultiply(pout, pout, &m); - D3DXMatrixRotationY(&m, yaw); - D3DXMatrixMultiply(pout, pout, &m); - return pout; + sroll = sinf(roll); + croll = cosf(roll); + spitch = sinf(pitch); + cpitch = cosf(pitch); + syaw = sinf(yaw); + cyaw = cosf(yaw); + + out->u.m[0][0] = sroll * spitch * syaw + croll * cyaw; + out->u.m[0][1] = sroll * cpitch; + out->u.m[0][2] = sroll * spitch * cyaw - croll * syaw; + out->u.m[0][3] = 0.0f; + out->u.m[1][0] = croll * spitch * syaw - sroll * cyaw; + out->u.m[1][1] = croll * cpitch; + out->u.m[1][2] = croll * spitch * cyaw + sroll * syaw; + out->u.m[1][3] = 0.0f; + out->u.m[2][0] = cpitch * syaw; + out->u.m[2][1] = -spitch; + out->u.m[2][2] = cpitch * cyaw; + out->u.m[2][3] = 0.0f; + out->u.m[3][0] = 0.0f; + out->u.m[3][1] = 0.0f; + out->u.m[3][2] = 0.0f; + out->u.m[3][3] = 1.0f; + + return out; } D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle)

1 0

Andrew Talbot : user32: Do not call HeapFree() with address of stack memory .
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 2f7885d99011e171fd3de3339374246e0f31cad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7885d99011e171fd3de3339… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 4 22:20:37 2012 +0000 user32: Do not call HeapFree() with address of stack memory. --- dlls/user32/sysparams.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3e9a639..08098c0 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -977,7 +977,6 @@ static BOOL get_path_entry( union sysparam_all_entry *entry, UINT int_param, voi if (load_entry( &entry->hdr, buffer, sizeof(buffer) )) lstrcpynW( entry->path.path, buffer, MAX_PATH ); - HeapFree( GetProcessHeap(), 0, buffer ); } lstrcpynW( ptr_param, entry->path.path, int_param ); return TRUE; @@ -996,7 +995,6 @@ static BOOL set_path_entry( union sysparam_all_entry *entry, UINT int_param, voi strcpyW( entry->path.path, buffer ); entry->hdr.loaded = TRUE; } - HeapFree( GetProcessHeap(), 0, buffer ); return ret; }

1 0

Stefan Dösinger : wined3d: Test the correct program for native limits.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: e53aa8c9e223e8db51bc13b7424700c010fcfb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53aa8c9e223e8db51bc13b74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:35 2012 +0100 wined3d: Test the correct program for native limits. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 45e725c..ee7762d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4315,7 +4315,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, { GLint native; - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); checkGLcall("glGetProgramivARB()"); if (!native) WARN("Program exceeds native resource limits.\n");

1 0

Stefan Dösinger : wined3d: Bind the src in a manual presentation blit.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 7b95df03c683e52b31d0e6a9e9e81072139c8f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b95df03c683e52b31d0e6a9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:33 2012 +0100 wined3d: Bind the src in a manual presentation blit. --- dlls/wined3d/swapchain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2fa221a..83d2ab5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -366,6 +366,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, ENTER_GL(); context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); + context_bind_texture(context2, backbuffer->texture_target, backbuffer->texture_name); /* Set up the texture. The surface is not in a wined3d_texture * container, so there are no D3D texture settings to dirtify. */

1 0

Michael Stefaniuc : qmgr: Merge a helper function.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 258d1ff897c62f3d568e56b9a0eb96e066aed323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258d1ff897c62f3d568e56b9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 23:27:01 2012 +0100 qmgr: Merge a helper function. --- dlls/qmgr/enum_jobs.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 3da0d13..20f427c 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -37,17 +37,6 @@ static inline EnumBackgroundCopyJobsImpl *impl_from_IEnumBackgroundCopyJobs(IEnu return CONTAINING_RECORD(iface, EnumBackgroundCopyJobsImpl, IEnumBackgroundCopyJobs_iface); } -static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) -{ - ULONG i; - - for(i = 0; i < This->numJobs; i++) - IBackgroundCopyJob_Release(This->jobs[i]); - - HeapFree(GetProcessHeap(), 0, This->jobs); - HeapFree(GetProcessHeap(), 0, This); -} - static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface(IEnumBackgroundCopyJobs *iface, REFIID riid, void **ppv) { @@ -78,11 +67,16 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs { EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p) ref=%d\n", This, ref); - if (ref == 0) - EnumBackgroundCopyJobsDestructor(This); + if (ref == 0) { + for(i = 0; i < This->numJobs; i++) + IBackgroundCopyJob_Release(This->jobs[i]); + HeapFree(GetProcessHeap(), 0, This->jobs); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Stefan Dösinger : wined3d: Use sign fixup for the atifs bumpenv matrix.
by Alexandre Julliard Dec. 5, 2012

Dec. 5, 2012

Module: wine Branch: master Commit: 799ea13fb90e36412e9773eb93da83675ed5e04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=799ea13fb90e36412e9773eb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:36 2012 +0100 wined3d: Use sign fixup for the atifs bumpenv matrix. --- dlls/wined3d/ati_fragment_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1b9b969..6aa91a6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -468,11 +468,11 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con */ wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE, GL_REG_0_ATI + stage, GL_RED, argmodextra_y, - ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_NONE, + ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN, GL_NONE); wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN_BIT_ATI, GL_NONE, GL_REG_0_ATI + stage, GL_GREEN, argmodextra_y, - ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_NONE, + ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE); }

1 0