winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
April 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
937 discussions
Start a n
N
ew thread
Alexandre Julliard : ws2_32: Signal overlapped completion in WSAIoctl.
by Alexandre Julliard
19 Apr '11
19 Apr '11
Module: wine Branch: master Commit: de0b4a67d81b6753d70e37ef6fa39b984296c607 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=de0b4a67d81b6753d70e37ef6…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 12:26:50 2011 +0200 ws2_32: Signal overlapped completion in WSAIoctl. --- dlls/ws2_32/socket.c | 202 ++++++++++++++++++++------------------------------ 1 files changed, 80 insertions(+), 122 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=de0b4a67d81b6753d70e3…
1
0
0
0
Alexandre Julliard : ws2_32: Merge ioctlsocket implementation into WSAIoctl .
by Alexandre Julliard
19 Apr '11
19 Apr '11
Module: wine Branch: master Commit: 7e208f4896806e74e0ea04eb0928d2cac83630f7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7e208f4896806e74e0ea04eb0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 11:57:37 2011 +0200 ws2_32: Merge ioctlsocket implementation into WSAIoctl. --- dlls/ws2_32/socket.c | 130 +++++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 81 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca6f27e..303462d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3068,30 +3068,62 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID DWORD out_size, LPDWORD ret_size, LPWSAOVERLAPPED overlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE completion ) { + int fd; + TRACE("%ld, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n", s, code, in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code) { case WS_FIONBIO: - if (in_size != sizeof(WS_u_long)) { + if (in_size != sizeof(WS_u_long) || IS_INTRESOURCE(in_buff)) + { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - return WS_ioctlsocket( s, WS_FIONBIO, in_buff); + if (_get_sock_mask(s)) + { + /* AsyncSelect()'ed sockets are always nonblocking */ + if (*(WS_u_long *)in_buff) return 0; + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (*(WS_u_long *)in_buff) + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); + else + _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); + return 0; - case WS_FIONREAD: - if (out_size != sizeof(WS_u_long)) { + case WS_FIONREAD: + case WS_SIOCATMARK: + { + int cmd = code == WS_FIONREAD ? FIONREAD : SIOCATMARK; + if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) + { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - return WS_ioctlsocket( s, WS_FIONREAD, out_buff); + if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; + if (ioctl(fd, cmd, out_buff ) == -1) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + release_sock_fd( s, fd ); + return SOCKET_ERROR; + } + release_sock_fd( s, fd ); + if (ret_size) *ret_size = sizeof(WS_u_long); + return 0; + } + + case WS_FIOASYNC: + WARN("Warning: WS1.1 shouldn't be using async I/O\n"); + SetLastError(WSAEINVAL); + return SOCKET_ERROR; case WS_SIO_GET_INTERFACE_LIST: { INTERFACE_INFO* intArray = out_buff; DWORD size, numInt, apiReturn; - int fd; TRACE("-> SIO_GET_INTERFACE_LIST request\n"); @@ -3355,7 +3387,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_KEEPALIVE_VALS: { - int fd; struct tcp_keepalive *k = in_buff; int keepalive = k->onoff ? 1 : 0; int keepidle = k->keepalivetime / 1000; @@ -3483,13 +3514,16 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; - default: - FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); - WSASetLastError(WSAEOPNOTSUPP); - return SOCKET_ERROR; - } + case 0x667e: /* Netscape tries hard to use bogus ioctl 0x667e */ + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + default: + FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + } - return 0; + return 0; } @@ -3498,74 +3532,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID */ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) { - int fd; - LONG newcmd = cmd; - - TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); - /* broken apps like defcon pass the argp value directly instead of a pointer to it */ - if(IS_INTRESOURCE(argp)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - switch( cmd ) - { - case WS_FIONREAD: - newcmd=FIONREAD; - break; - - case WS_FIONBIO: - if( _get_sock_mask(s) ) - { - /* AsyncSelect()'ed sockets are always nonblocking */ - if (*argp) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - if (*argp) - _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); - else - _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); - return 0; - - case WS_SIOCATMARK: - newcmd=SIOCATMARK; - break; - - case WS_FIOASYNC: - WARN("Warning: WS1.1 shouldn't be using async I/O\n"); - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - - case SIOCGIFBRDADDR: - case SIOCGIFNETMASK: - case SIOCGIFADDR: - /* These don't need any special handling. They are used by - WsControl, and are here to suppress an unnecessary warning. */ - break; - - default: - /* Netscape tries hard to use bogus ioctl 0x667e */ - /* FIXME: 0x667e above is ('f' << 8) | 126, and is a low word of - * FIONBIO (_IOW('f', 126, u_long)), how that should be handled? - */ - WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd); - break; - } - - fd = get_sock_fd( s, 0, NULL ); - if (fd != -1) - { - if( ioctl(fd, newcmd, (char*)argp ) == 0 ) - { - release_sock_fd( s, fd ); - return 0; - } - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); - release_sock_fd( s, fd ); - } - return SOCKET_ERROR; + DWORD ret_size; + return WSAIoctl( s, cmd, argp, sizeof(WS_u_long), argp, sizeof(WS_u_long), &ret_size, NULL, NULL ); } /***********************************************************************
1
0
0
0
Alexandre Julliard : ws2_32: Use saner parameter names in WSAIoctl.
by Alexandre Julliard
19 Apr '11
19 Apr '11
Module: wine Branch: master Commit: c4b67221d4f342453f4ed24f5c12e7049b296cd7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c4b67221d4f342453f4ed24f5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 11:34:42 2011 +0200 ws2_32: Use saner parameter names in WSAIoctl. --- dlls/ws2_32/socket.c | 106 +++++++++++++++++++++++--------------------------- 1 files changed, 49 insertions(+), 57 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b67221d4f342453f4ed…
1
0
0
0
Alexandre Julliard : server: Fix sharing parameters for debug event files, and don't fail if the file can't be opened.
by Alexandre Julliard
19 Apr '11
19 Apr '11
Module: wine Branch: master Commit: 1b868f4967f2dadd1d12b2b0fc5a14f9c5766ab4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1b868f4967f2dadd1d12b2b0f…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 10:29:44 2011 +0200 server: Fix sharing parameters for debug event files, and don't fail if the file can't be opened. --- server/debugger.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index c693c7d..2ee6f6d 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -155,18 +155,8 @@ static int fill_create_process_event( struct debug_event *event, const void *arg close_handle( debugger, event->data.create_process.process ); return 0; } - event->data.create_process.thread = handle; - - handle = 0; - if (exe_module->mapping && - /* the doc says write access too, but this doesn't seem a good idea */ - !(handle = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, 0 ))) - { - close_handle( debugger, event->data.create_process.process ); - close_handle( debugger, event->data.create_process.thread ); - return 0; - } - event->data.create_process.file = handle; + event->data.create_process.thread = handle; + event->data.create_process.file = 0; event->data.create_process.teb = thread->teb; event->data.create_process.base = exe_module->base; event->data.create_process.start = *entry; @@ -174,6 +164,10 @@ static int fill_create_process_event( struct debug_event *event, const void *arg event->data.create_process.dbg_size = exe_module->dbg_size; event->data.create_process.name = exe_module->name; event->data.create_process.unicode = 1; + + if (exe_module->mapping) /* the doc says write access too, but this doesn't seem a good idea */ + event->data.create_process.file = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } @@ -195,16 +189,16 @@ static int fill_load_dll_event( struct debug_event *event, const void *arg ) { struct process *debugger = event->debugger->process; const struct process_dll *dll = arg; - obj_handle_t handle = 0; - if (dll->mapping && !(handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, 0 ))) - return 0; - event->data.load_dll.handle = handle; + event->data.load_dll.handle = 0; event->data.load_dll.base = dll->base; event->data.load_dll.dbg_offset = dll->dbg_offset; event->data.load_dll.dbg_size = dll->dbg_size; event->data.load_dll.name = dll->name; event->data.load_dll.unicode = 1; + if (dll->mapping) + event->data.load_dll.handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; }
1
0
0
0
Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechniqueByName().
by Alexandre Julliard
18 Apr '11
18 Apr '11
Module: wine Branch: master Commit: fa608e247a114a266e7eff213d8eda9b2451612a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fa608e247a114a266e7eff213…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:53 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechniqueByName(). --- dlls/d3dx9_36/effect.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f11b755..fefb3b4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -605,8 +605,28 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + unsigned int i; - FIXME("iface %p, name %s stub\n", This, debugstr_a(name)); + TRACE("iface %p, name %s stub\n", This, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + for (i = 0; i < This->technique_count; ++i) + { + struct d3dx_technique *tech = get_technique_struct(This->technique_handles[i]); + + if (!strcmp(tech->name, name)) + { + TRACE("Returning technique %p\n", This->technique_handles[i]); + return This->technique_handles[i]; + } + } + + WARN("Invalid argument specified.\n"); return NULL; }
1
0
0
0
Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechnique().
by Alexandre Julliard
18 Apr '11
18 Apr '11
Module: wine Branch: master Commit: 6f824e171c27dadb3ea428cac61061d07c690dbd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6f824e171c27dadb3ea428cac…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:48 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechnique(). --- dlls/d3dx9_36/effect.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d35978c..f11b755 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -589,9 +589,17 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechnique(ID3DXBaseEffect *iface { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, index %u stub\n", This, index); + TRACE("iface %p, index %u\n", This, index); - return NULL; + if (index >= This->technique_count) + { + WARN("Invalid argument specified.\n"); + return NULL; + } + + TRACE("Returning technique %p\n", This->technique_handles[index]); + + return This->technique_handles[index]; } static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect *iface, LPCSTR name)
1
0
0
0
Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameter().
by Alexandre Julliard
18 Apr '11
18 Apr '11
Module: wine Branch: master Commit: e798d0016b2c5bc8c998ee32d37e839453ea99bd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e798d0016b2c5bc8c998ee32d…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:44 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetParameter(). --- dlls/d3dx9_36/effect.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dc67864..d35978c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -171,6 +171,90 @@ struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DX return NULL; } +struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) +{ + unsigned int i, count; + struct d3dx_parameter *p; + + for (i = 0; i < param->annotation_count; ++i) + { + if (param->annotation_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(param->annotation_handles[i]), parameter); + if (p) return p; + } + + if (param->element_count) count = param->element_count; + else count = param->member_count; + + for (i = 0; i < count; ++i) + { + if (param->member_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(param->member_handles[i]), parameter); + if (p) return p; + } + + return NULL; +} + +struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) +{ + unsigned int i, k, m; + struct d3dx_parameter *p; + + for (i = 0; i < base->parameter_count; ++i) + { + if (base->parameter_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(base->parameter_handles[i]), parameter); + if (p) return p; + } + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *technique = get_technique_struct(base->technique_handles[i]); + + for (k = 0; k < technique->pass_count; ++k) + { + struct d3dx_pass *pass = get_pass_struct(technique->pass_handles[k]); + + for (m = 0; m < pass->annotation_count; ++m) + { + if (pass->annotation_handles[i] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(pass->annotation_handles[m]), parameter); + if (p) return p; + } + } + + for (k = 0; k < technique->annotation_count; ++k) + { + if (technique->annotation_handles[k] == parameter) + { + return get_parameter_struct(parameter); + } + + p = is_valid_sub_parameter(get_parameter_struct(technique->annotation_handles[k]), parameter); + if (p) return p; + } + } + + return NULL; +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; @@ -448,7 +532,28 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameter(ID3DXBaseEffect *iface { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, parameter %p, index %u stub\n", This, parameter, index); + TRACE("iface %p, parameter %p, index %u\n", This, parameter, index); + + if (!parameter) + { + if (index < This->parameter_count) + { + TRACE("Returning parameter %p\n", This->parameter_handles[index]); + return This->parameter_handles[index]; + } + } + else + { + struct d3dx_parameter *param = is_valid_parameter(This, parameter); + + if (param && !param->element_count && index < param->member_count) + { + TRACE("Returning parameter %p\n", param->member_handles[index]); + return param->member_handles[index]; + } + } + + WARN("Invalid argument specified.\n"); return NULL; }
1
0
0
0
Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechniqueDesc().
by Alexandre Julliard
18 Apr '11
18 Apr '11
Module: wine Branch: master Commit: d64eb4699f871a6bf002799194cea687ca0a8b97 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d64eb4699f871a6bf00279919…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:39 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechniqueDesc(). --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 595baba..dc67864 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -156,6 +156,21 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE) pass; } +struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) +{ + unsigned int i; + + for (i = 0; i < base->technique_count; ++i) + { + if (base->technique_handles[i] == technique) + { + return get_technique_struct(technique); + } + } + + return NULL; +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; @@ -394,10 +409,21 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetParameterDesc(ID3DXBaseEffect *ifac static HRESULT WINAPI ID3DXBaseEffectImpl_GetTechniqueDesc(ID3DXBaseEffect *iface, D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_technique *tech = technique ? is_valid_technique(This, technique) : get_technique_struct(This->technique_handles[0]); - FIXME("iface %p, technique %p, desc %p stub\n", This, technique, desc); + TRACE("iface %p, technique %p, desc %p\n", This, technique, desc); - return E_NOTIMPL; + if (!desc || !tech) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = tech->name; + desc->Passes = tech->pass_count; + desc->Annotations = tech->annotation_count; + + return D3D_OK; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetPassDesc(ID3DXBaseEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc)
1
0
0
0
Rico Schüller : d3dx9: Fix d3dx9_parse_effect_typedef for D3DXPC_STRUCT.
by Alexandre Julliard
18 Apr '11
18 Apr '11
Module: wine Branch: master Commit: 4482ca41d0466dcae8063345b9a71f5e4b905720 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4482ca41d0466dcae8063345b…
Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:34 2011 +0200 d3dx9: Fix d3dx9_parse_effect_typedef for D3DXPC_STRUCT. --- dlls/d3dx9_36/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 66b5a40..595baba 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2734,6 +2734,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch if (param->element_count) { unsigned int param_bytes = 0; + const char *save_ptr = *ptr; member_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member_handles) * param->element_count); if (!member_handles) @@ -2746,6 +2747,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch for (i = 0; i < param->element_count; ++i) { struct d3dx_parameter *member; + *ptr = save_ptr; member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member)
1
0
0
0
Alexandre Julliard : server: Store a mapping instead of a file for process dlls.
by Alexandre Julliard
18 Apr '11
18 Apr '11
Module: wine Branch: master Commit: 900352bc6bd32c6524658083339ba119620be9c7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=900352bc6bd32c65246580833…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 14:14:40 2011 +0200 server: Store a mapping instead of a file for process dlls. --- dlls/ntdll/loader.c | 20 +++++++++++++------- include/wine/server_protocol.h | 4 ++-- server/debugger.c | 8 +++++--- server/file.c | 6 ------ server/file.h | 3 ++- server/mapping.c | 6 ++++++ server/process.c | 18 +++++++++--------- server/process.h | 2 +- server/protocol.def | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 11 files changed, 41 insertions(+), 32 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=900352bc6bd32c6524658…
1
0
0
0
← Newer
1
...
29
30
31
32
33
34
35
...
94
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
Results per page:
10
25
50
100
200