December 2010 - Wine-commits

Jacek Caban : mshtml: Added ActiveX control creation implementation.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 0b046c94ac52b05983ac8cae7e2aef0bfec771b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b046c94ac52b05983ac8cae7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 2 13:50:02 2010 +0100 mshtml: Added ActiveX control creation implementation. --- dlls/mshtml/npplugin.c | 183 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 75 ++++++++++++++++++ dlls/mshtml/tests/activex.c | 12 ++- 3 files changed, 264 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b046c94ac52b05983ac8…

1 0

Nikolay Sivov : comctl32/listview: Don't touch out text pointer if it wasn' t requested.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: f0f3157da1af733271a25b22e05c8df8f6969dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f3157da1af733271a25b22e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 2 20:26:01 2010 +0300 comctl32/listview: Don't touch out text pointer if it wasn't requested. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd9a499..8c8637f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -982,7 +982,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP TRACE(" pdi->item=%s\n", debuglvitem_t(&pdi->item, infoPtr->notifyFormat != NFR_ANSI)); ret = notify_hdr(infoPtr, code, &pdi->hdr); - TRACE(" resulting code=0x%08x\n", pdi->hdr.code); + TRACE(" resulting code=%d\n", pdi->hdr.code); if (return_ansi || return_unicode) { @@ -1011,7 +1011,7 @@ static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISP } /* if dipsinfo holder changed notification code then convert */ - if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW)) + if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW) && (pdi->item.mask & LVIF_TEXT)) { length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); @@ -6472,6 +6472,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, return FALSE; if (lpLVItem->mask == 0) return TRUE; + TRACE("mask=%x\n", lpLVItem->mask); /* make a local copy */ isubitem = lpLVItem->iSubItem; @@ -8901,10 +8902,10 @@ static HWND LISTVIEW_SetToolTips( LISTVIEW_INFO *infoPtr, HWND hwndNewToolTip) * RETURN: * Old Unicode Format */ -static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL fUnicode) +static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL unicode) { SHORT rc = infoPtr->notifyFormat; - infoPtr->notifyFormat = (fUnicode) ? NFR_UNICODE : NFR_ANSI; + infoPtr->notifyFormat = (unicode) ? NFR_UNICODE : NFR_ANSI; return rc == NFR_UNICODE; } @@ -9322,6 +9323,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) (WPARAM)infoPtr->hwndSelf, NF_QUERY); /* on error defaulting to ANSI notifications */ if (infoPtr->notifyFormat == 0) infoPtr->notifyFormat = NFR_ANSI; + TRACE("notify format=%d\n", infoPtr->notifyFormat); if ((infoPtr->uView == LV_VIEW_DETAILS) && (lpcs->style & WS_VISIBLE)) {

1 0

Austin English : msvcrt: Fix a compiler warning on PowerPC.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 6374205eb4ed5f399a99a2b46497a35e5c402ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6374205eb4ed5f399a99a2b46… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 2 19:36:07 2010 +0000 msvcrt: Fix a compiler warning on PowerPC. --- dlls/msvcrt/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 69ba4b8..3847f84 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2492,7 +2492,7 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) */ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) { - char c; + int c; if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT)) {

1 0

André Hentschel : advapi32/tests: More tests for the merged view of HKEY_CLASSES_ROOT.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 9c7366c05e2f54916516ec707e2235f7c2ebb8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7366c05e2f54916516ec707… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 2 21:59:14 2010 +0100 advapi32/tests: More tests for the merged view of HKEY_CLASSES_ROOT. --- dlls/advapi32/tests/registry.c | 85 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 505d5ad..d4beb17 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1914,7 +1914,7 @@ static void test_redirection(void) static void test_classesroot(void) { - HKEY hkey, hkcr; + HKEY hkey, hklm, hkcr; DWORD size = 8; DWORD type = REG_SZ; static CHAR buffer[8]; @@ -1963,8 +1963,91 @@ static void test_classesroot(void) /* cleanup */ delete_key( hkey ); + delete_key( hkcr ); RegCloseKey( hkey ); RegCloseKey( hkcr ); + + /* create a key in the hklm classes */ + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", &hklm )) + { + delete_key( hklm ); + RegCloseKey( hklm ); + } + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hklm, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to add a system class\n"); + return; + } + + /* try to open that key in hkcr */ + res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); + ok(res == ERROR_SUCCESS, + "test key not found in hkcr: %d\n", res); + if (res) + { + delete_key( hklm ); + RegCloseKey( hklm ); + return; + } + + /* set a value in hklm classes */ + res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in hkcr */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + + /* modify the value in hkcr */ + res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + + /* check that the value is not modified in hklm classes */ + res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + + if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + + /* try to open that key in hkcr */ + res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcr ); + ok(res == ERROR_SUCCESS, + "test key not found in hkcr: %d\n", res); + + /* set a value in user's classes */ + res = RegSetValueExA(hkey, "val2", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in hkcr */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + + /* modify the value in hklm */ + res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* check that the value is not overwritten in hkcr or user's classes */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + res = RegQueryValueExA(hkey, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + + /* cleanup */ + delete_key( hkey ); + delete_key( hklm ); + delete_key( hkcr ); + RegCloseKey( hkey ); + RegCloseKey( hklm ); + RegCloseKey( hkcr ); } static void test_deleted_key(void)

1 0

Joris Huizer : msi: Don't leak memory on error path.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: d4d7c263cba6fc0e49ff6efd357f52c966c4816a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d7c263cba6fc0e49ff6efd3… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Thu Dec 2 22:52:41 2010 +0100 msi: Don't leak memory on error path. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 391bf9a..6fa1038 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -391,6 +391,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL if (file == INVALID_HANDLE_VALUE) { msiobj_release( &row->hdr ); + msi_free( binary ); return NULL; } do

1 0

Juan Lang : ws2_32: Set length on successful return from WSAStringToAddress .
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 7f5583aee9f8ac782376f73c05049febec6f8049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5583aee9f8ac782376f73c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 2 15:28:23 2010 -0800 ws2_32: Set length on successful return from WSAStringToAddress. --- dlls/ws2_32/socket.c | 2 ++ dlls/ws2_32/tests/sock.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0bc773e..51139c9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5953,6 +5953,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } + *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; @@ -5990,6 +5991,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, break; } #ifdef HAVE_INET_PTON + *lpAddressLength = sizeof(SOCKADDR_IN6); memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6843846..9e0b4cb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1801,8 +1801,9 @@ static void test_WSAStringToAddressA(void) static void test_WSAStringToAddressW(void) { INT ret, len; - SOCKADDR_IN sockaddr; + SOCKADDR_IN sockaddr, *sin; SOCKADDR_IN6 sockaddr6; + SOCKADDR_STORAGE sockaddr_storage; int GLE; WCHAR address1[] = { '0','.','0','.','0','.','0', 0 }; @@ -1866,6 +1867,20 @@ static void test_WSAStringToAddressW(void) (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + /* Test with a larger buffer than necessary */ + len = sizeof(sockaddr_storage); + sin = (SOCKADDR_IN *)&sockaddr_storage; + sin->sin_port = 0; + sin->sin_addr.s_addr = 0; + + ret = WSAStringToAddressW( address5, AF_INET, NULL, (SOCKADDR*)sin, &len ); + ok( (ret == 0 && sin->sin_addr.s_addr == 0xffffffff && sin->sin_port == 0xffff) || + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), + "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + ok( len == sizeof(SOCKADDR_IN) || + broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, + "unexpected length %d\n", len ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6;

1 0

Henri Verbeet : wined3d: Properly initialize min_rel_offset.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: b72b0371288b42a3866ca939ee90bfb56689dcc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72b0371288b42a3866ca939e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:44 2010 +0100 wined3d: Properly initialize min_rel_offset. This somehow got lost in 14da44aa364539d2c2d392c042921cc430b21c47. --- dlls/wined3d/shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8220d65..320b2f4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -459,6 +459,7 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct const DWORD *ptr = byte_code; memset(reg_maps, 0, sizeof(*reg_maps)); + reg_maps->min_rel_offset = ~0U; /* get_registers_used() is called on every compile on some 1.x shaders, * which can result in stacking up a collection of local constants.

1 0

Henri Verbeet : wined3d: Move the rel_offset vertex shader field to the ARB shader backend.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: fe47ba8fa296b17d28afcb53eed21c392c511732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe47ba8fa296b17d28afcb53e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:45 2010 +0100 wined3d: Move the rel_offset vertex shader field to the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 122 ++++++++++++++++++++++--------------- dlls/wined3d/shader.c | 25 -------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 72 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe47ba8fa296b17d28afc…

1 0

Henri Verbeet : wined3d: need_rel_addr_const() is only ever called for vertex shaders.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: e43cd744b61aaec4ecef341caaa0d98689d48ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43cd744b61aaec4ecef341ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:46 2010 +0100 wined3d: need_rel_addr_const() is only ever called for vertex shaders. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bb338bf..2e5424e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,13 +316,10 @@ struct shader_arb_priv }; /* GL locking for state handlers is done by the caller. */ -static BOOL need_rel_addr_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (shader->baseShader.reg_maps.shader_version.type == WINED3D_SHADER_TYPE_VERTEX) - { - const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; - if (shader_data->rel_offset) return TRUE; - } + const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; + if (shader_data->rel_offset) return TRUE; if (!shader->baseShader.reg_maps.usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -334,7 +331,7 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) && !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } -static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_helper_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { if (need_rel_addr_const(shader, gl_info)) return TRUE; if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ @@ -346,7 +343,7 @@ static BOOL need_helper_const(IWineD3DBaseShaderImpl *shader, const struct wined return FALSE; } -static unsigned int reserved_vs_const(IWineD3DBaseShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load @@ -735,7 +732,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF -= reserved_vs_const(This, gl_info); + max_constantsF -= reserved_vs_const((IWineD3DVertexShaderImpl *)This, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -3171,7 +3168,8 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent */ - if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + if (need_helper_const(This, gl_info)) + { const char *two = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_TWO); shader_addline(buffer, "MAD TMP_OUT.z, TMP_OUT.z, %s, -TMP_OUT.w;\n", two); } else { @@ -4104,10 +4102,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct } shader_addline(buffer, "TEMP TMP_OUT;\n"); - if(need_helper_const((IWineD3DBaseShaderImpl *) This, gl_info)) { + if (need_helper_const(This, gl_info)) + { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } - if (need_rel_addr_const((IWineD3DBaseShaderImpl *) This, gl_info)) + if (need_rel_addr_const(This, gl_info)) { shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", shader_data->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n");

1 0

Henri Verbeet : wined3d: Explicitly pass shader_data and reg_maps to need_rel_addr_const().
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 8c1e326e3cf0c7c8faaceea6c01905c486f1c21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1e326e3cf0c7c8faaceea6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:47 2010 +0100 wined3d: Explicitly pass shader_data and reg_maps to need_rel_addr_const(). --- dlls/wined3d/arb_program_shader.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e5424e..d16ea28 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,11 +316,11 @@ struct shader_arb_priv }; /* GL locking for state handlers is done by the caller. */ -static BOOL need_rel_addr_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) +static BOOL need_rel_addr_const(const struct arb_vshader_private *shader_data, + const struct shader_reg_maps *reg_maps, const struct wined3d_gl_info *gl_info) { - const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; if (shader_data->rel_offset) return TRUE; - if (!shader->baseShader.reg_maps.usesmova) return FALSE; + if (!reg_maps->usesmova) return FALSE; return !gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]; } @@ -333,7 +333,8 @@ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) static BOOL need_helper_const(IWineD3DVertexShaderImpl *shader, const struct wined3d_gl_info *gl_info) { - if (need_rel_addr_const(shader, gl_info)) return TRUE; + if (need_rel_addr_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) return TRUE; if (!gl_info->supported[NV_VERTEX_PROGRAM]) return TRUE; /* Need to init colors. */ if (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) return TRUE; /* Load the immval offset. */ if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ @@ -349,7 +350,8 @@ static unsigned int reserved_vs_const(IWineD3DVertexShaderImpl *shader, const st /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader. */ if (need_helper_const(shader, gl_info)) ++ret; - if (need_rel_addr_const(shader, gl_info)) ++ret; + if (need_rel_addr_const(shader->baseShader.backend_data, + &shader->baseShader.reg_maps, gl_info)) ++ret; return ret; } @@ -4106,7 +4108,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps); } - if (need_rel_addr_const(This, gl_info)) + if (need_rel_addr_const(shader_data, reg_maps, gl_info)) { shader_addline(buffer, "PARAM rel_addr_const = { 0.5, %d.0, 0.0, 0.0 };\n", shader_data->rel_offset); shader_addline(buffer, "TEMP A0_SHADOW;\n");

1 0