wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Erich E. Hoover : ws2_32: Check for invalid parameters in TransmitFile.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 109d4b914ab8649fcd90c2623e45feb86be133ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=109d4b914ab8649fcd90c2623… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jan 17 12:35:57 2014 -0700 ws2_32: Check for invalid parameters in TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> --- dlls/ws2_32/socket.c | 21 ++++++++++ dlls/ws2_32/tests/sock.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4edb579..44926de 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2731,8 +2731,29 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, DWORD flags ) { + union generic_unix_sockaddr uaddr; + unsigned int uaddrlen = sizeof(uaddr); + int fd; + FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, buffers, flags ); + + fd = get_sock_fd( s, 0, NULL ); + if (fd == -1) + { + WSASetLastError( WSAENOTSOCK ); + return FALSE; + } + if (getpeername( fd, &uaddr.addr, &uaddrlen ) != 0) + { + release_sock_fd( s, fd ); + WSASetLastError( WSAENOTCONN ); + return FALSE; + } + release_sock_fd( s, fd ); + if (flags) + FIXME("Flags are not currently supported (0x%x).\n", flags); + WSASetLastError( WSAEOPNOTSUPP ); return FALSE; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7574631..a8ee3ce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7425,6 +7425,108 @@ end: closesocket(connector2); } +static void test_TransmitFile(void) +{ + GUID transmitFileGuid = WSAID_TRANSMITFILE; + LPFN_TRANSMITFILE pTransmitFile = NULL; + HANDLE file = INVALID_HANDLE_VALUE; + char system_ini_path[MAX_PATH]; + struct sockaddr_in bindAddress; + SOCKET client, server, dest; + DWORD num_bytes, err; + int iret, len; + BOOL bret; + + /* Setup sockets for testing TransmitFile */ + client = socket(AF_INET, SOCK_STREAM, 0); + server = socket(AF_INET, SOCK_STREAM, 0); + if (client == INVALID_SOCKET || server == INVALID_SOCKET) + { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto cleanup; + } + iret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &transmitFileGuid, sizeof(transmitFileGuid), + &pTransmitFile, sizeof(pTransmitFile), &num_bytes, NULL, NULL); + if (iret) + { + skip("WSAIoctl failed to get TransmitFile with ret %d + errno %d\n", iret, WSAGetLastError()); + goto cleanup; + } + GetSystemWindowsDirectoryA(system_ini_path, MAX_PATH ); + strcat(system_ini_path, "\\system.ini"); + file = CreateFileA(system_ini_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); + if (file == INVALID_HANDLE_VALUE) + { + skip("Unable to open a file to transmit.\n"); + goto cleanup; + } + + /* Test TransmitFile with an invalid socket */ + bret = pTransmitFile(INVALID_SOCKET, file, 0, 0, NULL, NULL, 0); + err = WSAGetLastError(); + ok(!bret, "TransmitFile succeeded unexpectedly.\n"); + ok(err == WSAENOTSOCK, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTSOCK); + + /* Test a bogus TransmitFile without a connected socket */ + bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, TF_REUSE_SOCKET); + err = WSAGetLastError(); + ok(!bret, "TransmitFile succeeded unexpectedly.\n"); + ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN); + + /* Setup a properly connected socket for transfers */ + memset(&bindAddress, 0, sizeof(bindAddress)); + bindAddress.sin_family = AF_INET; + bindAddress.sin_port = htons(9375); + bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(server, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) + { + skip("failed to bind(), error %d\n", WSAGetLastError()); + goto cleanup; + } + iret = listen(server, 1); + if (iret != 0) + { + skip("failed to listen(), error %d\n", WSAGetLastError()); + goto cleanup; + } + iret = connect(client, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + if (iret != 0) + { + skip("failed to connect(), error %d\n", WSAGetLastError()); + goto cleanup; + } + len = sizeof(bindAddress); + dest = accept(server, (struct sockaddr*)&bindAddress, &len); + if (dest == INVALID_SOCKET) + { + skip("failed to accept(), error %d\n", WSAGetLastError()); + goto cleanup; + } + if (set_blocking(dest, FALSE)) + { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto cleanup; + } + + /* Test TransmitFile with no possible buffer */ + bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); + todo_wine ok(bret, "TransmitFile failed unexpectedly.\n"); + + /* Test TransmitFile with a UDP datagram socket */ + closesocket(client); + client = socket(AF_INET, SOCK_DGRAM, 0); + bret = pTransmitFile(client, NULL, 0, 0, NULL, NULL, 0); + err = WSAGetLastError(); + ok(!bret, "TransmitFile succeeded unexpectedly.\n"); + ok(err == WSAENOTCONN, "TransmitFile triggered unexpected errno (%d != %d)\n", err, WSAENOTCONN); + +cleanup: + CloseHandle(file); + closesocket(client); + closesocket(server); +} + static void test_getpeername(void) { SOCKET sock; @@ -8793,6 +8895,7 @@ START_TEST( sock ) test_events(1); test_ipv6only(); + test_TransmitFile(); test_GetAddrInfoW(); test_getaddrinfo(); test_AcceptEx();

1 0

Erich E. Hoover : ws2_32: Add stub for TransmitFile.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 23c293ae4c9929a08fd122b64d928c2cfb37f2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c293ae4c9929a08fd122b64… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jan 16 17:52:50 2014 -0700 ws2_32: Add stub for TransmitFile. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> --- dlls/ws2_32/socket.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5098f85..4edb579 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2725,6 +2725,19 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } /*********************************************************************** + * TransmitFile + */ +static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD bytes_per_send, + LPOVERLAPPED overlapped, LPTRANSMIT_FILE_BUFFERS buffers, + DWORD flags ) +{ + FIXME("(%lx, %p, %d, %d, %p, %p, %d): stub !\n", s, h, file_bytes, bytes_per_send, overlapped, + buffers, flags ); + WSASetLastError( WSAEOPNOTSUPP ); + return FALSE; +} + +/*********************************************************************** * GetAcceptExSockaddrs */ static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, @@ -4430,7 +4443,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&transmitfile_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n"); + *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile; + break; } else if ( IsEqualGUID(&transmitpackets_guid, in_buff) ) {

1 0

Jonathan Vollebregt : reg: Simplify root key search.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 60f599f58480ce154d2cc8ac843be92916657170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f599f58480ce154d2cc8ac8… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Sun Oct 4 21:14:46 2015 +0200 reg: Simplify root key search. Signed-off-by: Michel Zou <xantares09(a)hotmail.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- programs/reg/reg.c | 85 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e4d121c..00eaab0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -22,6 +22,32 @@ #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +static const WCHAR short_hklm[] = {'H','K','L','M',0}; +static const WCHAR short_hkcu[] = {'H','K','C','U',0}; +static const WCHAR short_hkcr[] = {'H','K','C','R',0}; +static const WCHAR short_hku[] = {'H','K','U',0}; +static const WCHAR short_hkcc[] = {'H','K','C','C',0}; +static const WCHAR long_hklm[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; +static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; +static const WCHAR long_hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; +static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}; +static const WCHAR long_hkcc[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; + +static const struct +{ + HKEY key; + const WCHAR *short_name; + const WCHAR *long_name; +} +root_rels[] = +{ + {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, + {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, + {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, + {HKEY_USERS, short_hku, long_hku}, + {HKEY_CURRENT_CONFIG, short_hkcc, long_hkcc}, +}; + static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; @@ -95,51 +121,26 @@ static int reg_message(int msg) return reg_printfW(formatW, msg_buffer); } -static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) +static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name) { - int i; + DWORD length = strlenW(rootkey_name); - for (i = 0; i < len; i++) - { - if (!str[i]) - { - len = i + 1; - break; - } - } - - return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, len) - CSTR_EQUAL; + return (!strncmpiW(input_path, rootkey_name, length) && + (input_path[length] == 0 || input_path[length] == '\\')); } -static HKEY get_rootkey(LPWSTR key) +static HKEY path_get_rootkey(const WCHAR *path) { - static const WCHAR szHKLM[] = {'H','K','L','M',0}; - static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; - static const WCHAR szHKCU[] = {'H','K','C','U',0}; - static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; - static const WCHAR szHKCR[] = {'H','K','C','R',0}; - static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; - static const WCHAR szHKU[] = {'H','K','U',0}; - static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0}; - static const WCHAR szHKCC[] = {'H','K','C','C',0}; - static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - - if (!reg_StrCmpNIW(key, szHKLM, 4) || - !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) - return HKEY_LOCAL_MACHINE; - else if (!reg_StrCmpNIW(key, szHKCU, 4) || - !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) - return HKEY_CURRENT_USER; - else if (!reg_StrCmpNIW(key, szHKCR, 4) || - !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) - return HKEY_CLASSES_ROOT; - else if (!reg_StrCmpNIW(key, szHKU, 3) || - !reg_StrCmpNIW(key, szHKEY_USERS, 10)) - return HKEY_USERS; - else if (!reg_StrCmpNIW(key, szHKCC, 4) || - !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) - return HKEY_CURRENT_CONFIG; - else return NULL; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(root_rels); i++) + { + if (path_rootname_cmp(path, root_rels[i].short_name) || + path_rootname_cmp(path, root_rels[i].long_name)) + return root_rels[i].key; + } + + return NULL; } static DWORD wchar_get_type(const WCHAR *type_name) @@ -280,7 +281,7 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, } p++; - root = get_rootkey(key_name); + root = path_get_rootkey(key_name); if (!root) { reg_message(STRING_INVALID_KEY); @@ -350,7 +351,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, } p++; - root = get_rootkey(key_name); + root = path_get_rootkey(key_name); if (!root) { reg_message(STRING_INVALID_KEY);

1 0

Matteo Bruni : wined3d: Initialize unwritten color varyings.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 97ee9451edae82154b289cb57b46ef13aedd58b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ee9451edae82154b289cb57… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:23 2015 +0200 wined3d: Initialize unwritten color varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5dfe0fa..042cd03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4927,6 +4927,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, if (ps_major < 3) { + DWORD colors_written_mask[2] = {0}; DWORD texcoords_written_mask[MAX_TEXTURES] = {0}; if (!legacy_context) @@ -4949,7 +4950,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, write_mask = output->mask; shader_glsl_write_mask_to_str(write_mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR)) + if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_COLOR) && semantic_idx < 2) { if (!semantic_idx) shader_addline(buffer, "gl_FrontColor%s = vs_out[%u]%s;\n", @@ -4957,6 +4958,8 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, else if (semantic_idx == 1) shader_addline(buffer, "gl_FrontSecondaryColor%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); + + colors_written_mask[semantic_idx] = write_mask; } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_POSITION) && !semantic_idx) { @@ -4985,6 +4988,19 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, } } + for (i = 0; i < 2; ++i) + { + if (colors_written_mask[i] != WINED3DSP_WRITEMASK_ALL) + { + shader_glsl_write_mask_to_str(~colors_written_mask[i] & WINED3DSP_WRITEMASK_ALL, reg_mask); + if (!i) + shader_addline(buffer, "gl_FrontColor%s = vec4(1.0)%s;\n", + reg_mask, reg_mask); + else + shader_addline(buffer, "gl_FrontSecondaryColor%s = vec4(0.0)%s;\n", + reg_mask, reg_mask); + } + } for (i = 0; i < MAX_TEXTURES; ++i) { if (ps && !(ps->reg_maps.texcoord & (1u << i)))

1 0

Matteo Bruni : wined3d: Output all the texture coordinates in the FFP replacement VS when there are enough varyings.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 09eda02b6896f5fe4ca7db5e1c13cbc67f8118e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09eda02b6896f5fe4ca7db5e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:22 2015 +0200 wined3d: Output all the texture coordinates in the FFP replacement VS when there are enough varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/utils.c | 11 +++++++++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f38111f..5dfe0fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6803,7 +6803,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings; - wined3d_ffp_get_vs_settings(state, &context->stream_info, &settings); + wined3d_ffp_get_vs_settings(context, state, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; @@ -7971,11 +7971,11 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; - /* Because of settings->texcoords, we have to always regenerate the - * vertex shader on a vdecl change. - * TODO: Just always output all the texcoords when there are enough - * varyings available to drop the dependency. */ - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; + /* Because of settings->texcoords, we have to regenerate the vertex + * shader on a vdecl change if there aren't enough varyings to just + * always output all the texture coordinates. */ + if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info)) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; if (use_ps(state) && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.major == 1 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 41e72fe..9c4fdd9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4825,9 +4825,12 @@ const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions = ffp_frag_program_key_compare, }; -void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si, - struct wined3d_ffp_vs_settings *settings) +void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { + const struct wined3d_stream_info *si = &context->stream_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; if (si->position_transformed) @@ -4851,6 +4854,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } + if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) + settings->texcoords = (1u << MAX_TEXTURES) - 1; return; } @@ -4900,6 +4905,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct settings->texcoords |= 1u << i; settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } + if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) + settings->texcoords = (1u << MAX_TEXTURES) - 1; settings->light_type = 0; for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d147199..3071726 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1939,8 +1939,8 @@ struct wined3d_ffp_vs_desc struct wined3d_ffp_vs_settings settings; }; -void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si, - struct wined3d_ffp_vs_settings *settings) DECLSPEC_HIDDEN; +void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, + const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) DECLSPEC_HIDDEN; struct wined3d {

1 0

Matteo Bruni : wined3d: Avoid reading uninitialized texcoord varyings in pixel shaders.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 08b21528ed51d7ece92ea67fe0afe1d2a998c989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b21528ed51d7ece92ea67fe… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:21 2015 +0200 wined3d: Avoid reading uninitialized texcoord varyings in pixel shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 79 +++++++++++++++++++++------------------ dlls/wined3d/shader.c | 32 +++++++++++++++- dlls/wined3d/wined3d_private.h | 5 ++- 4 files changed, 77 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08b21528ed51d7ece92ea…

1 0

Matteo Bruni : wined3d: Avoid reading uninitialized texcoord varyings in FFP replacement fragment shaders.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: f511787423f468a679837761ef4ea841ba7a3fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=f511787423f468a679837761e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 7 00:15:08 2015 +0200 wined3d: Avoid reading uninitialized texcoord varyings in FFP replacement fragment shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 37 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54f004f..c58ea07 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6295,20 +6295,35 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (legacy_context) { + shader_addline(buffer, "vec4 ffp_texcoord[%u];\n", MAX_TEXTURES); shader_addline(buffer, "float ffp_varying_fogcoord;\n"); } else { + shader_addline(buffer, "vec4 ffp_texcoord[%u];\n", MAX_TEXTURES); declare_in_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); } shader_addline(buffer, "void main()\n{\n"); + for (stage = 0; stage < MAX_TEXTURES; ++stage) + { + if (tex_map & (1u << stage)) + { + if (settings->pointsprite) + shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", stage); + else if (settings->texcoords_initialized & (1u << stage)) + shader_addline(buffer, "ffp_texcoord[%u] = gl_TexCoord[%u];\n", stage, stage); + else + shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", stage); + } + } + if (legacy_context && settings->fog != WINED3D_FFP_PS_FOG_OFF) shader_addline(buffer, "ffp_varying_fogcoord = gl_FogFragCoord;\n"); if (lowest_disabled_stage < 7 && settings->emul_clipplanes) - shader_addline(buffer, "if (any(lessThan(gl_TexCoord[7], vec4(0.0)))) discard;\n"); + shader_addline(buffer, "if (any(lessThan(ffp_texcoord[7], vec4(0.0)))) discard;\n"); /* Generate texture sampling instructions) */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) @@ -6409,20 +6424,20 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * { if (settings->op[stage].projected == proj_count4) { - shader_addline(buffer, "ret.xy = (ret.xy * gl_TexCoord[%u].w) + gl_TexCoord[%u].xy;\n", + shader_addline(buffer, "ret.xy = (ret.xy * ffp_texcoord[%u].w) + ffp_texcoord[%u].xy;\n", stage, stage); - shader_addline(buffer, "ret.zw = gl_TexCoord[%u].ww;\n", stage); + shader_addline(buffer, "ret.zw = ffp_texcoord[%u].ww;\n", stage); } else { - shader_addline(buffer, "ret.xy = (ret.xy * gl_TexCoord[%u].z) + gl_TexCoord[%u].xy;\n", + shader_addline(buffer, "ret.xy = (ret.xy * ffp_texcoord[%u].z) + ffp_texcoord[%u].xy;\n", stage, stage); - shader_addline(buffer, "ret.zw = gl_TexCoord[%u].zz;\n", stage); + shader_addline(buffer, "ret.zw = ffp_texcoord[%u].zz;\n", stage); } } else { - shader_addline(buffer, "ret = gl_TexCoord[%u] + ret.xyxy;\n", stage); + shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", @@ -6434,12 +6449,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == proj_count3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", + shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", stage, texture_function, stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", + shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", stage, texture_function, stage, stage, coord_mask); } @@ -8391,10 +8406,22 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, static void glsl_fragment_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + /* Because of settings->texcoords_initialized. */ + if (!use_ps(state) && context->gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(context->gl_info)) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) glsl_fragment_pipe_fog(context, state, state_id); } +static void glsl_fragment_pipe_vs(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + /* Because of settings->texcoords_initialized. */ + if (!use_ps(state) && context->gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(context->gl_info)) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; +} + static void glsl_fragment_pipe_tex_transform(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -8447,6 +8474,7 @@ static void glsl_fragment_pipe_color_key(struct wined3d_context *context, static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_fragment_pipe_vs }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), glsl_fragment_pipe_invalidate_constants}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8265b9c..41e72fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4629,6 +4629,43 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->color_key_enabled = 1; else settings->color_key_enabled = 0; + + /* texcoords_initialized is set to meaningful values only when GL doesn't + * support enough varyings to always pass around all the possible texture + * coordinates. + * This is used to avoid reading a varying not written by the vertex shader. + * Reading uninitialized varyings on core profile contexts results in an + * error while with builtin varyings on legacy contexts you get undefined + * behavior. */ + if (d3d_info->limits.varying_count + && d3d_info->limits.varying_count < wined3d_max_compat_varyings(gl_info)) + { + settings->texcoords_initialized = 0; + for (i = 0; i < MAX_TEXTURES; ++i) + { + if (use_vs(state)) + { + if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.output_registers & (1u << i)) + settings->texcoords_initialized |= 1u << i; + } + else + { + const struct wined3d_stream_info *si = &context->stream_info; + unsigned int coord_idx = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; + if ((state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX] >> WINED3D_FFP_TCI_SHIFT) + & WINED3D_FFP_TCI_MASK + || (coord_idx < MAX_TEXTURES && (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))))) + settings->texcoords_initialized |= 1u << i; + } + } + } + else + { + settings->texcoords_initialized = (1u << MAX_TEXTURES) - 1; + } + + settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] + && state->gl_primitive_type == GL_POINTS; } const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe3f97d..e8a9929 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1865,8 +1865,10 @@ struct ffp_frag_settings enum wined3d_ffp_ps_fog_mode fog; unsigned char sRGB_write; unsigned char emul_clipplanes; - unsigned char color_key_enabled; - unsigned char padding; + unsigned char texcoords_initialized; + unsigned char color_key_enabled : 1; + unsigned char pointsprite : 1; + unsigned char padding : 6; }; struct ffp_frag_desc

1 0

Matteo Bruni : wined3d: Store supported varyings count in d3d_limits.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 93db8e97da2690c62a5d4586d6214632a98df344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db8e97da2690c62a5d4586d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:19 2015 +0200 wined3d: Store supported varyings count in d3d_limits. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a321db..b1d9869 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5161,6 +5161,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } + caps->varying_count = 0; caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6801bcc..6d51432 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3707,6 +3707,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->d3d_info.limits.ps_version = shader_caps.ps_version; adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; + adapter->d3d_info.limits.varying_count = shader_caps.varying_count; adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c85b334..54f004f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7632,6 +7632,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = gl_info->limits.glsl_vs_float_constants; caps->ps_uniform_count = gl_info->limits.glsl_ps_float_constants; + caps->varying_count = gl_info->limits.glsl_varyings; /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement. diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2d80877..8574881 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1989,6 +1989,7 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = 0; caps->ps_uniform_count = 0; caps->ps_1x_max_value = 0.0f; + caps->varying_count = 0; caps->wined3d_caps = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d57899..fe3f97d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -774,6 +774,7 @@ struct shader_caps DWORD vs_uniform_count; DWORD ps_uniform_count; float ps_1x_max_value; + DWORD varying_count; DWORD wined3d_caps; }; @@ -1748,6 +1749,7 @@ struct wined3d_d3d_limits UINT vs_version, gs_version, ps_version; DWORD vs_uniform_count; DWORD ps_uniform_count; + UINT varying_count; UINT ffp_textures; UINT ffp_blend_stages; UINT ffp_vertex_blend_matrices;

1 0

Riccardo Bortolato : d3d8: Don' t use a wined3d_volume in d3d8_volume_GetDesc.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: eeea2af596859fc2b77ca28685a7a1545e6fe718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeea2af596859fc2b77ca2868… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:51 2015 +0200 d3d8: Don't use a wined3d_volume in d3d8_volume_GetDesc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 3 +-- dlls/d3d8/device.c | 2 +- dlls/d3d8/volume.c | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index aec4831..ab6a3d4 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -206,12 +206,11 @@ struct d3d8_volume struct d3d8_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_volume *wined3d_volume; struct d3d8_texture *texture; }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_swapchain { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6ba476e..818f601 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3029,7 +3029,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, volume, parent_ops); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 81cd40e..e37330c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -116,13 +116,13 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); @@ -203,12 +203,11 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume8_iface.lpVtbl = &d3d8_volume_vtbl; d3d8_resource_init(&volume->resource); volume->resource.refcount = 0; - volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); volume->wined3d_texture = wined3d_texture; volume->sub_resource_idx = sub_resource_idx;

1 0

Riccardo Bortolato : d3d8: Make use of wined3d_texture_unmap in d3d8_volume_UnlockBox.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: d49ad6c608c3e5effa0915527d87a5d13c6b4d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49ad6c608c3e5effa0915527… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:50 2015 +0200 d3d8: Make use of wined3d_texture_unmap in d3d8_volume_UnlockBox. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 52562ad..81cd40e 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_volume_unmap(volume->wined3d_volume); + hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); wined3d_mutex_unlock(); return hr;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
75
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 October 2015