December 2007 - Wine-commits

Jacek Caban : urlmon: Added CoInternetQueryInfo implementation.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 7d223172c5c69680244a85e5802b55c468ee871b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d223172c5c69680244a85e58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 01:59:25 2007 +0100 urlmon: Added CoInternetQueryInfo implementation. --- dlls/urlmon/internet.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 22 ++-------------------- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 66939df..b8168ab 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -254,3 +254,47 @@ HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCo return UrlCompareW(pwzUrl1, pwzUrl2, dwCompareFlags) ? S_FALSE : S_OK; } + +/*********************************************************************** + * CoInternetQueryInfo (URLMON.@) + * + * Retrieves information relevant to a specified URL + * + */ +HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption, + DWORD dwQueryFlags, LPVOID pvBuffer, DWORD cbBuffer, DWORD *pcbBuffer, + DWORD dwReserved) +{ + IInternetProtocolInfo *protocol_info; + HRESULT hres; + + TRACE("(%s, %x, %x, %p, %x, %p, %x): stub\n", debugstr_w(pwzUrl), + QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved); + + protocol_info = get_protocol_info(pwzUrl); + + if(protocol_info) { + hres = IInternetProtocolInfo_QueryInfo(protocol_info, pwzUrl, QueryOption, dwQueryFlags, + pvBuffer, cbBuffer, pcbBuffer, dwReserved); + IInternetProtocolInfo_Release(protocol_info); + + return SUCCEEDED(hres) ? hres : E_FAIL; + } + + switch(QueryOption) { + case QUERY_USES_NETWORK: + if(!pvBuffer || cbBuffer < sizeof(DWORD)) + return E_FAIL; + + *(DWORD*)pvBuffer = 0; + if(pcbBuffer) + *pcbBuffer = sizeof(DWORD); + break; + + default: + FIXME("Not supported option %d\n", QueryOption); + return E_NOTIMPL; + } + + return S_OK; +} diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 3954641..7b4a772 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1126,26 +1126,6 @@ HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPCWSTR szURL, IMoniker ** } /*********************************************************************** - * CoInternetQueryInfo (URLMON.@) - * - * Retrieves information relevant to a specified URL - * - * RETURNS - * S_OK success - * S_FALSE buffer too small - * INET_E_QUERYOPTIONUNKNOWN invalid option - * - */ -HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption, - DWORD dwQueryFlags, LPVOID pvBuffer, DWORD cbBuffer, DWORD * pcbBuffer, - DWORD dwReserved) -{ - FIXME("(%s, %x, %x, %p, %x, %p, %x): stub\n", debugstr_w(pwzUrl), - QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved); - return S_OK; -} - -/*********************************************************************** * IsAsyncMoniker (URLMON.@) */ HRESULT WINAPI IsAsyncMoniker(IMoniker *pmk) @@ -1184,6 +1164,8 @@ HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback LPBC pbc = NULL; HRESULT hr = E_INVALIDARG; + TRACE("(%p %08x %p %s %p)\n", pmk, grfOpt, pbsc, debugstr_guid(iidResult), ppvResult); + if (pmk && ppvResult) { *ppvResult = NULL;

1 0

Jacek Caban : urlmon: Added CoInternetQueryInfo tests.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 6b6eb8c4360b39f9955f7c75502369bbde6be693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6eb8c4360b39f9955f7c755… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 01:59:38 2007 +0100 urlmon: Added CoInternetQueryInfo tests. --- dlls/urlmon/tests/misc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 863e8a7..76b257b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -350,6 +350,48 @@ static void test_CoInternetCompareUrl(void) ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); } +static const struct { + LPCWSTR url; + DWORD uses_net; +} query_info_tests[] = { + {url1, 0}, + {url2, 0}, + {url3, 0}, + {url4, 0}, + {url5, 0}, + {url6, 0}, + {url7, 0}, + {url8, 0} +}; + +static void test_CoInternetQueryInfo(void) +{ + BYTE buf[100]; + DWORD cb, i; + HRESULT hres; + + for(i=0; i < sizeof(query_info_tests)/sizeof(query_info_tests[0]); i++) { + cb = 0xdeadbeef; + memset(buf, '?', sizeof(buf)); + hres = CoInternetQueryInfo(query_info_tests[0].url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &cb, 0); + ok(hres == S_OK, "[%d] CoInternetQueryInfo failed: %08x\n", i, hres); + ok(cb == sizeof(DWORD), "[%d] cb = %d\n", i, cb); + ok(*(DWORD*)buf == query_info_tests[i].uses_net, "[%d] ret %x, expected %x\n", + i, *(DWORD*)buf, query_info_tests[i].uses_net); + + hres = CoInternetQueryInfo(query_info_tests[0].url, QUERY_USES_NETWORK, 0, buf, 3, &cb, 0); + ok(hres == E_FAIL, "[%d] CoInternetQueryInfo failed: %08x, expected E_FAIL\n", i, hres); + hres = CoInternetQueryInfo(query_info_tests[0].url, QUERY_USES_NETWORK, 0, NULL, sizeof(buf), &cb, 0); + ok(hres == E_FAIL, "[%d] CoInternetQueryInfo failed: %08x, expected E_FAIL\n", i, hres); + + memset(buf, '?', sizeof(buf)); + hres = CoInternetQueryInfo(query_info_tests[0].url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), NULL, 0); + ok(hres == S_OK, "[%d] CoInternetQueryInfo failed: %08x\n", i, hres); + ok(*(DWORD*)buf == query_info_tests[i].uses_net, "[%d] ret %x, expected %x\n", + i, *(DWORD*)buf, query_info_tests[i].uses_net); + } +} + static const WCHAR mimeTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR mimeTextPlain[] = {'t','e','x','t','/','p','l','a','i','n',0}; static const WCHAR mimeTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; @@ -1196,6 +1238,7 @@ START_TEST(misc) test_RegisterFormatEnumerator(); test_CoInternetParseUrl(); test_CoInternetCompareUrl(); + test_CoInternetQueryInfo(); test_FindMimeFromData(); test_SecurityManager(); test_ZoneManager();

1 0

Jacek Caban : urlmon: RegisterNameSpace clean up.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: 96be709c2e63d57ca83bbc755e3e8b83b8f92e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96be709c2e63d57ca83bbc755… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 28 01:59:51 2007 +0100 urlmon: RegisterNameSpace clean up. --- dlls/urlmon/session.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 044b3ea..f5a644f 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -184,7 +184,6 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface, const LPCWSTR *ppwzPatterns, DWORD dwReserved) { name_space *new_name_space; - int size; TRACE("(%p %s %s %d %p %d)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol), cPatterns, ppwzPatterns, dwReserved); @@ -199,12 +198,9 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface, new_name_space = heap_alloc(sizeof(name_space)); - size = (strlenW(pwzProtocol)+1)*sizeof(WCHAR); - new_name_space->protocol = heap_alloc(size); - memcpy(new_name_space->protocol, pwzProtocol, size); - IClassFactory_AddRef(pCF); new_name_space->cf = pCF; + new_name_space->protocol = heap_strdupW(pwzProtocol); new_name_space->clsid = *rclsid; new_name_space->next = name_space_list;

1 0

Stefan Dösinger : wined3d: Multiply the half pixel correction with .w.
by Alexandre Julliard 28 Dec '07

28 Dec '07

Module: wine Branch: master Commit: ea093f4a3884e0869b5dc00f36ae6889526e8648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea093f4a3884e0869b5dc00f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 27 21:20:59 2007 +0100 wined3d: Multiply the half pixel correction with .w. --- dlls/wined3d/vertexshader.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e50bf8f..d6c34d8 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -413,7 +413,8 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x * contains 1.0 to allow a mad. */ - shader_addline(&buffer, "gl_Position.xy = gl_Position.xy * posFixup.xy + posFixup.zw;\n"); + shader_addline(&buffer, "gl_Position.y = gl_Position.y * posFixup.y;\n"); + shader_addline(&buffer, "gl_Position.xy += posFixup.zw * gl_Position.ww;\n"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * @@ -444,10 +445,7 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( This->baseShader.limits.constant_float = min(95, This->baseShader.limits.constant_float); - /* Some instructions need a temporary register. Add it if needed, but only if it is really needed */ - if(reg_maps->usesnrm || This->rel_offset) { - shader_addline(&buffer, "TEMP TMP;\n"); - } + shader_addline(&buffer, "TEMP TMP;\n"); /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION); @@ -479,8 +477,9 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. */ - shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, posFixup.z;\n"); - shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, posFixup.w;\n"); + shader_addline(&buffer, "MUL TMP, posFixup, TMP_OUT.w;\n"); + shader_addline(&buffer, "ADD TMP_OUT.x, TMP_OUT.x, TMP.z;\n"); + shader_addline(&buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TMP.w;\n"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent

1 0

Aric Stewart : fonts: Correct External leading for japanese small font and enable fontmetric test for the font .
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: a8e62526f7ba17f5f4c3c1d8c4fb7a24ec87a99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e62526f7ba17f5f4c3c1d8c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 26 08:15:06 2007 -0600 fonts: Correct External leading for japanese small font and enable fontmetric test for the font. --- dlls/gdi32/tests/font.c | 3 +-- tools/sfnt2fnt.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0893b87..d38ec8d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -347,8 +347,7 @@ static void test_bitmap_font_metrics(void) { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, CP1251_BIT }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, CP932_BIT }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, CP1252_BIT | CP1250_BIT | CP1251_BIT }, -/* No proper small font for Japanese yet */ -/* { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, CP932_BIT }, */ + { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, CP932_BIT }, { "Fixedsys", FW_NORMAL, 15, 12, 3, 3, 0, 8, 8, CP1252_BIT | CP1250_BIT }, { "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, CP1251_BIT }, { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, CP932_BIT } diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 8868c66..0a32598 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -312,8 +312,8 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha /* Hack: Courier has no internal leading, nor do any Chinese or Japanese fonts */ if(!strcmp(face->family_name, "Courier") || enc == 936 || enc == 950 || enc == 932) il = 0; - /* Japanese fonts have an external leading */ - if(enc == 932) + /* Japanese system fonts have an external leading (not small font) */ + if (enc == 932 && ppem > 11) el = 2; else el = 0;

1 0

Marcus Meissner : d3d9: Initialize pVertexBuffer.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 2cb3f982a6add3706bff5ffe85282d4e2ec39948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb3f982a6add3706bff5ffe8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 24 15:01:18 2007 +0100 d3d9: Initialize pVertexBuffer. --- dlls/d3d9/tests/device.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a5a2f06..9405673 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1662,7 +1662,7 @@ static void test_set_stream_source(void) IDirect3D9 *d3d9; HWND hwnd; HRESULT hr; - IDirect3DVertexBuffer9 *pVertexBuffer; + IDirect3DVertexBuffer9 *pVertexBuffer = NULL; d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); @@ -1692,23 +1692,23 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_CreateVertexBuffer( device, 512, 0, 0, D3DPOOL_DEFAULT, &pVertexBuffer, NULL ); ok(hr == D3D_OK, "Failed to create a vertex buffer, hr = %s\n", DXGetErrorString9(hr)); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 0, 32); - ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 1, 32); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 1, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 2, 32); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 2, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 3, 32); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 3, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 4, 32); - ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", - DXGetErrorString9(hr)); - + if (SUCCEEDED(hr)) { + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 0, 32); + ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 1, 32); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 1, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 2, 32); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 2, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 3, 32); + ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 3, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 4, 32); + ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", + DXGetErrorString9(hr)); + } /* Try to set the NULL buffer with an offset and stride 0 */ hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", @@ -1729,8 +1729,8 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", DXGetErrorString9(hr)); - cleanup: if(pVertexBuffer) IDirect3DDevice9_Release(pVertexBuffer); +cleanup: if(device) IDirect3DDevice9_Release(device); if(d3d9) IDirect3D9_Release(d3d9); }

1 0

Mike McCormack : shell32: Implement "My Network Places" shell folder.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: cc405b1522748c15696313efe2dfd9fa78e5719c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc405b1522748c15696313efe… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Dec 26 11:48:15 2007 +0300 shell32: Implement "My Network Places" shell folder. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/pidl.c | 6 + dlls/shell32/pidl.h | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shfldr_netplaces.c | 656 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shres.rc | 4 + 7 files changed, 670 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc405b1522748c1569631…

1 0

Rob Shearman : server: Initialise the apc_call_t union in async_set_result to all zero to avoid a Valgrind warning .
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 0b0c75ed19b13cea00d763b2ea0fb7bbbc1a0828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0c75ed19b13cea00d763b2e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 27 13:50:35 2007 +0000 server: Initialise the apc_call_t union in async_set_result to all zero to avoid a Valgrind warning. --- server/async.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/async.c b/server/async.c index baed133..879616d 100644 --- a/server/async.c +++ b/server/async.c @@ -263,6 +263,7 @@ void async_set_result( struct object *obj, unsigned int status, unsigned long to if (async->data.apc) { apc_call_t data; + memset( &data, 0, sizeof(data) ); data.type = APC_USER; data.user.func = async->data.apc; data.user.args[0] = (unsigned long)async->data.arg;

1 0

Stefan Dösinger : wined3d: Get rid of the invymat.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: 44b8915371a7a021e39c2f298d00b8e4be583fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b8915371a7a021e39c2f298… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 25 23:14:05 2007 +0100 wined3d: Get rid of the invymat. glScalef(1.0, -1.0, 1.0) does the same as the glMultMatrix with the invymat matrix, and it is more optimal. --- dlls/wined3d/state.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8e9e19b..c62e3fa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2735,12 +2735,6 @@ static void transform_view(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } } -static const GLfloat invymat[16] = { - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f}; - static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { glMatrixMode(GL_PROJECTION); checkGLcall("glMatrixMode(GL_PROJECTION)"); @@ -2808,8 +2802,8 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { - glMultMatrixf(invymat); - checkGLcall("glMultMatrixf(invymat)"); + glScalef(1.0, -1.0, 1.0); + checkGLcall("glScalef"); } } else { /* The rule is that the window coordinate 0 does not correspond to the @@ -2833,12 +2827,13 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, -1.0); checkGLcall("glTranslatef (1.0 / width, -1.0 / height, -1.0)"); glScalef(1.0, 1.0, 2.0); + checkGLcall("glScalef"); /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { - glMultMatrixf(invymat); - checkGLcall("glMultMatrixf(invymat)"); + glScalef(1.0, -1.0, 1.0); + checkGLcall("glScalef"); } glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf");

1 0

Stefan Dösinger : wined3d: Combine two glScalef calls into one.
by Alexandre Julliard 27 Dec '07

27 Dec '07

Module: wine Branch: master Commit: fd711c57df5005ad2664cd66a75bbd83556c1eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd711c57df5005ad2664cd66a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 26 22:12:05 2007 +0100 wined3d: Combine two glScalef calls into one. --- dlls/wined3d/state.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c62e3fa..59ff3d4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2826,15 +2826,15 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock */ glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, -1.0); checkGLcall("glTranslatef (1.0 / width, -1.0 / height, -1.0)"); - glScalef(1.0, 1.0, 2.0); - checkGLcall("glScalef"); - - /* D3D texture coordinates are flipped compared to OpenGL ones, so - * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { - glScalef(1.0, -1.0, 1.0); - checkGLcall("glScalef"); + /* D3D texture coordinates are flipped compared to OpenGL ones, so + * render everything upside down when rendering offscreen. */ + glScalef(1.0, -1.0, 2.0); + } else { + glScalef(1.0, 1.0, 2.0); } + checkGLcall("glScalef"); + glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_PROJECTION].u.m[0][0]); checkGLcall("glLoadMatrixf"); }

1 0