December 2010 - Wine-Commits

Alexandre Julliard : widl: Allow specifying a version for a coclass independently of its typelib version .
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: e5f65edfc9f57907591fd213f3f5e68222d51130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f65edfc9f57907591fd213f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 15:51:29 2010 +0100 widl: Allow specifying a version for a coclass independently of its typelib version. --- tools/widl/parser.y | 2 +- tools/widl/register.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c924a66..30ae5f4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2108,7 +2108,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_UUID */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "uuid" }, /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "version" }, + /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "version" }, /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, }; diff --git a/tools/widl/register.c b/tools/widl/register.c index 9913f8c..d58fc0a 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -134,7 +134,8 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) if (typelib) { const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); - const unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + unsigned int version = get_attrv( class->attrs, ATTR_VERSION ); + if (!version) version = get_attrv( typelib->attrs, ATTR_VERSION ); put_str( indent, "TypeLib = s '%s'\n", format_uuid( typelib_uuid )); put_str( indent, "Version = s '%u.%u'\n", MAJORVERSION(version), MINORVERSION(version) ); }

1 0

Greg Geldorp : ntdll/tests: Add alternative results for overlong instructions.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: 3e6d91280d1b98caa8ab55ac54fc4dbecfece0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d91280d1b98caa8ab55ac5… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Dec 22 14:03:17 2010 +0100 ntdll/tests: Add alternative results for overlong instructions. --- dlls/ntdll/tests/exception.c | 93 ++++++++++++++++++++++++++---------------- 1 files changed, 58 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 701b6bb..dd03d5f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -72,13 +72,16 @@ static BOOL is_wow64; static const struct exception { - BYTE code[18]; /* asm code */ - BYTE offset; /* offset of faulting instruction */ - BYTE length; /* length of faulting instruction */ - BOOL wow64_broken; /* broken on Wow64, should be skipped */ - NTSTATUS status; /* expected status code */ - DWORD nb_params; /* expected number of parameters */ - DWORD params[4]; /* expected parameters */ + BYTE code[18]; /* asm code */ + BYTE offset; /* offset of faulting instruction */ + BYTE length; /* length of faulting instruction */ + BOOL wow64_broken; /* broken on Wow64, should be skipped */ + NTSTATUS status; /* expected status code */ + DWORD nb_params; /* expected number of parameters */ + DWORD params[4]; /* expected parameters */ + NTSTATUS alt_status; /* alternative status code */ + DWORD alt_nb_params; /* alternative number of parameters */ + DWORD alt_params[4]; /* alternative parameters */ } exceptions[] = { /* 0 */ @@ -137,66 +140,67 @@ static const struct exception 6, 6, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test moving %cs -> %ss */ - { { 0x0e, 0x17, 0x58, 0xc3 }, /* 18: pushl %cs; popl %ss; popl %eax; ret */ + { { 0x0e, 0x17, 0x58, 0xc3 }, /* pushl %cs; popl %ss; popl %eax; ret */ 1, 1, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* 20 */ /* test overlong instruction (limit is 15 bytes, 5 on Win7) */ { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 16, TRUE, STATUS_ILLEGAL_INSTRUCTION, 0 }, + 0, 16, TRUE, STATUS_ILLEGAL_INSTRUCTION, 0, { 0 }, + STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, { { 0x64,0x64,0x64,0x64,0xfa,0xc3 }, 0, 5, TRUE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test invalid interrupt */ - { { 0xcd, 0xff, 0xc3 }, /* 21: int $0xff; ret */ + { { 0xcd, 0xff, 0xc3 }, /* int $0xff; ret */ 0, 2, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test moves to/from Crx */ - { { 0x0f, 0x20, 0xc0, 0xc3 }, /* 22: movl %cr0,%eax; ret */ + { { 0x0f, 0x20, 0xc0, 0xc3 }, /* movl %cr0,%eax; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x20, 0xe0, 0xc3 }, /* 23: movl %cr4,%eax; ret */ + { { 0x0f, 0x20, 0xe0, 0xc3 }, /* movl %cr4,%eax; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* 25 */ - { { 0x0f, 0x22, 0xc0, 0xc3 }, /* 24: movl %eax,%cr0; ret */ + { { 0x0f, 0x22, 0xc0, 0xc3 }, /* movl %eax,%cr0; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x22, 0xe0, 0xc3 }, /* 25: movl %eax,%cr4; ret */ + { { 0x0f, 0x22, 0xe0, 0xc3 }, /* movl %eax,%cr4; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test moves to/from Drx */ - { { 0x0f, 0x21, 0xc0, 0xc3 }, /* 26: movl %dr0,%eax; ret */ + { { 0x0f, 0x21, 0xc0, 0xc3 }, /* movl %dr0,%eax; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x21, 0xc8, 0xc3 }, /* 27: movl %dr1,%eax; ret */ + { { 0x0f, 0x21, 0xc8, 0xc3 }, /* movl %dr1,%eax; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x21, 0xf8, 0xc3 }, /* 28: movl %dr7,%eax; ret */ + { { 0x0f, 0x21, 0xf8, 0xc3 }, /* movl %dr7,%eax; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* 30 */ - { { 0x0f, 0x23, 0xc0, 0xc3 }, /* 29: movl %eax,%dr0; ret */ + { { 0x0f, 0x23, 0xc0, 0xc3 }, /* movl %eax,%dr0; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x23, 0xc8, 0xc3 }, /* 30: movl %eax,%dr1; ret */ + { { 0x0f, 0x23, 0xc8, 0xc3 }, /* movl %eax,%dr1; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0x0f, 0x23, 0xf8, 0xc3 }, /* 31: movl %eax,%dr7; ret */ + { { 0x0f, 0x23, 0xf8, 0xc3 }, /* movl %eax,%dr7; ret */ 0, 3, FALSE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test memory reads */ - { { 0xa1, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* 32: movl 0xfffffffc,%eax; ret */ + { { 0xa1, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffc,%eax; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffc } }, - { { 0xa1, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* 33: movl 0xfffffffd,%eax; ret */ + { { 0xa1, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffd,%eax; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffd } }, /* 35 */ - { { 0xa1, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* 34: movl 0xfffffffe,%eax; ret */ + { { 0xa1, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffe,%eax; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffe } }, - { { 0xa1, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* 35: movl 0xffffffff,%eax; ret */ + { { 0xa1, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xffffffff,%eax; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, /* test memory writes */ - { { 0xa3, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* 36: movl %eax,0xfffffffc; ret */ + { { 0xa3, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffc; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffc } }, - { { 0xa3, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* 37: movl %eax,0xfffffffd; ret */ + { { 0xa3, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffd; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffd } }, - { { 0xa3, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* 38: movl %eax,0xfffffffe; ret */ + { { 0xa3, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffe; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffe } }, /* 40 */ - { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* 39: movl %eax,0xffffffff; ret */ + { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffff; ret */ 0, 5, FALSE, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffff } }, /* test exception with cleared %ds and %es (broken on Wow64) */ @@ -389,14 +393,23 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram trace( "exception %u: %x flags:%x addr:%p\n", entry, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - ok( rec->ExceptionCode == except->status, + ok( rec->ExceptionCode == except->status || + (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); ok( rec->ExceptionAddress == (char*)code_mem + except->offset, "%u: Wrong exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)code_mem + except->offset ); - ok( rec->NumberParameters == except->nb_params, - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); + if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) + { + ok( rec->NumberParameters == except->nb_params, + "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); + } + else + { + ok( rec->NumberParameters == except->alt_nb_params, + "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); + } /* Most CPUs (except Intel Core apparently) report a segment limit violation */ /* instead of page faults for accesses beyond 0xffffffff */ @@ -414,10 +427,20 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram goto skip_params; } - for (i = 0; i < rec->NumberParameters; i++) - ok( rec->ExceptionInformation[i] == except->params[i], - "%u: Wrong parameter %d: %lx/%x\n", - entry, i, rec->ExceptionInformation[i], except->params[i] ); + if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) + { + for (i = 0; i < rec->NumberParameters; i++) + ok( rec->ExceptionInformation[i] == except->params[i], + "%u: Wrong parameter %d: %lx/%x\n", + entry, i, rec->ExceptionInformation[i], except->params[i] ); + } + else + { + for (i = 0; i < rec->NumberParameters; i++) + ok( rec->ExceptionInformation[i] == except->alt_params[i], + "%u: Wrong parameter %d: %lx/%x\n", + entry, i, rec->ExceptionInformation[i], except->alt_params[i] ); + } skip_params: /* don't handle exception if it's not the address we expected */

1 0

David Hedberg : urlmon: Split the code for sending an http request into its own function.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: 5be7064d9016fb3bd026d9c2b974758822b6d94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be7064d9016fb3bd026d9c2b… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Dec 22 00:50:24 2010 +0100 urlmon: Split the code for sending an http request into its own function. --- dlls/urlmon/http.c | 87 +++++++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 38 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 2aaefb0..cfa2fc6 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -80,13 +80,54 @@ static LPWSTR query_http_info(HttpProtocol *This, DWORD option) return ret; } +static ULONG send_http_request(HttpProtocol *This) +{ + INTERNET_BUFFERSW send_buffer = {sizeof(INTERNET_BUFFERSW)}; + BOOL res; + + send_buffer.lpcszHeader = This->full_header; + send_buffer.dwHeadersLength = send_buffer.dwHeadersTotal = strlenW(This->full_header); + + if(This->base.bind_info.dwBindVerb != BINDVERB_GET) { + switch(This->base.bind_info.stgmedData.tymed) { + case TYMED_HGLOBAL: + /* Native does not use GlobalLock/GlobalUnlock, so we won't either */ + send_buffer.lpvBuffer = This->base.bind_info.stgmedData.u.hGlobal; + send_buffer.dwBufferLength = send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; + break; + case TYMED_ISTREAM: { + LARGE_INTEGER offset; + + send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; + if(!This->base.post_stream) { + This->base.post_stream = This->base.bind_info.stgmedData.u.pstm; + IStream_AddRef(This->base.post_stream); + } + + offset.QuadPart = 0; + IStream_Seek(This->base.post_stream, offset, STREAM_SEEK_SET, NULL); + break; + } + default: + FIXME("Unsupported This->base.bind_info.stgmedData.tymed %d\n", This->base.bind_info.stgmedData.tymed); + } + } + + if(This->base.post_stream) + res = HttpSendRequestExW(This->base.request, &send_buffer, NULL, 0, 0); + else + res = HttpSendRequestW(This->base.request, send_buffer.lpcszHeader, send_buffer.dwHeadersLength, + send_buffer.lpvBuffer, send_buffer.dwBufferLength); + + return res ? 0 : GetLastError(); +} + #define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(HttpProtocol, base, iface) static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request_flags, HINTERNET internet_session, IInternetBindInfo *bind_info) { HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); - INTERNET_BUFFERSW send_buffer = {sizeof(INTERNET_BUFFERSW)}; LPWSTR addl_header = NULL, post_cookie = NULL; IServiceProvider *service_provider = NULL; IHttpNegotiate2 *http_negotiate2 = NULL; @@ -95,7 +136,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques const WCHAR **accept_types; BYTE security_id[512]; DWORD len = 0, port; - ULONG num; + ULONG num, error; BOOL res, b; HRESULT hres; @@ -236,48 +277,18 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques } } - send_buffer.lpcszHeader = This->full_header; - send_buffer.dwHeadersLength = send_buffer.dwHeadersTotal = strlenW(This->full_header); - - if(This->base.bind_info.dwBindVerb != BINDVERB_GET) { - switch(This->base.bind_info.stgmedData.tymed) { - case TYMED_HGLOBAL: - /* Native does not use GlobalLock/GlobalUnlock, so we won't either */ - send_buffer.lpvBuffer = This->base.bind_info.stgmedData.u.hGlobal; - send_buffer.dwBufferLength = send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; - break; - case TYMED_ISTREAM: { - LARGE_INTEGER offset; - - send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; - This->base.post_stream = This->base.bind_info.stgmedData.u.pstm; - IStream_AddRef(This->base.post_stream); - - offset.QuadPart = 0; - IStream_Seek(This->base.post_stream, offset, STREAM_SEEK_SET, NULL); - break; - } - default: - FIXME("Unsupported This->base.bind_info.stgmedData.tymed %d\n", This->base.bind_info.stgmedData.tymed); - } - } - b = TRUE; res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); if(!res) WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %08x\n", GetLastError()); - if(This->base.post_stream) - res = HttpSendRequestExW(This->base.request, &send_buffer, NULL, 0, 0); - else - res = HttpSendRequestW(This->base.request, send_buffer.lpcszHeader, send_buffer.dwHeadersLength, - send_buffer.lpvBuffer, send_buffer.dwBufferLength); - if(!res && GetLastError() != ERROR_IO_PENDING) { - WARN("HttpSendRequest failed: %d\n", GetLastError()); - return INET_E_DOWNLOAD_FAILURE; - } + error = send_http_request(This); - return S_OK; + if(error == ERROR_IO_PENDING || error == ERROR_SUCCESS) + return S_OK; + + WARN("HttpSendRequest failed: %d\n", error); + return INET_E_DOWNLOAD_FAILURE; } static HRESULT HttpProtocol_end_request(Protocol *protocol)

1 0

David Hedberg : shell32: Standardize the COM usage in ebrowser.c.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: 239a88e1e46b528195a5f5ee3e0e247dd06467c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239a88e1e46b528195a5f5ee3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Dec 22 02:20:47 2010 +0100 shell32: Standardize the COM usage in ebrowser.c. --- dlls/shell32/ebrowser.c | 82 +++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=239a88e1e46b528195a5f…

1 0

David Hedberg : urlmon: Fix return value from QueryService.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: 3e10d4e90de242c5d732234ed09f02ec30e23054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e10d4e90de242c5d732234ed… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Dec 22 00:50:25 2010 +0100 urlmon: Fix return value from QueryService. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index beedddd..d0c795c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1373,7 +1373,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, } WARN("unknown service %s\n", debugstr_guid(guidService)); - return E_NOTIMPL; + return E_NOINTERFACE; } #undef SERVPROV_THIS

1 0

David Hedberg : include: Add a few INET_E_ defines.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: 7081e848ade3068f561f0a1b4b41c15eff78367c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7081e848ade3068f561f0a1b4… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Dec 22 00:50:23 2010 +0100 include: Add a few INET_E_ defines. --- include/urlmon.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index ec0354f..d2a46a0 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1927,6 +1927,9 @@ cpp_quote("#define INET_E_QUERYOPTION_UNKNOWN _HRESULT_TYPEDEF_(0x800C0013 cpp_quote("#define INET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x800C0014)") cpp_quote("#define INET_E_REDIRECT_TO_DIR _HRESULT_TYPEDEF_(0x800C0015)") cpp_quote("#define INET_E_CANNOT_LOCK_REQUEST _HRESULT_TYPEDEF_(0x800C0016)") +cpp_quote("#define INET_E_USE_EXTENDED_BINDING _HRESULT_TYPEDEF_(0x800C0017)") +cpp_quote("#define INET_E_TERMINATED_BIND _HRESULT_TYPEDEF_(0x800C0018)") +cpp_quote("#define INET_E_INVALID_CERTIFICATE _HRESULT_TYPEDEF_(0x800C0019)") cpp_quote("#define INET_E_CODE_DOWNLOAD_DECLINED _HRESULT_TYPEDEF_(0x800C0100)") cpp_quote("#define INET_E_RESULT_DISPATCHED _HRESULT_TYPEDEF_(0x800C0200)") cpp_quote("#define INET_E_CANNOT_REPLACE_SFP_FILE _HRESULT_TYPEDEF_(0x800C0300)")

1 0

André Hentschel : shlwapi/tests: Allow Win7 behaviour for SHFormatDateTimeW.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: c063e5ccddcea3593763d06841cc96eb9519d0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c063e5ccddcea3593763d0684… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 22 00:48:45 2010 +0100 shlwapi/tests: Allow Win7 behaviour for SHFormatDateTimeW. --- dlls/shlwapi/tests/ordinal.c | 71 +++++++++++++++++++++++++----------------- 1 files changed, 42 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c063e5ccddcea3593763d…

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetOutputParameterDesc().
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: bf1065ea6dd9f349f8898304a83fa51ec46ec7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1065ea6dd9f349f8898304a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 22 12:16:12 2010 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetOutputParameterDesc(). --- dlls/d3dcompiler_43/reflection.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a7aef62..ddeb8d5 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -161,9 +161,19 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameter static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + + if (!desc || !This->osgn || index >= This->osgn->element_count) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + *desc = This->osgn->elements[index]; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetPatchConstantParameterDesc().
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: 97988d63d8f9f1a623a2947228783ced9510d9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=97988d63d8f9f1a623a294722… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 22 12:16:32 2010 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetPatchConstantParameterDesc(). --- dlls/d3dcompiler_43/reflection.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index ddeb8d5..d50e18c 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -179,9 +179,19 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParamete static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p\n", iface, index, desc); + + if (!desc || !This->pcsg || index >= This->pcsg->element_count) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + *desc = This->pcsg->elements[index]; + + return S_OK; } static struct ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetVariableByName(

1 0

Rico Schüller : d3dcompiler: Parse PCSG in the reflection interface.
by Alexandre Julliard Dec. 22, 2010

Dec. 22, 2010

Module: wine Branch: master Commit: bfcd413553b4c8ca4a22b95a3399118ae7964f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcd413553b4c8ca4a22b95a3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 22 12:15:36 2010 +0100 d3dcompiler: Parse PCSG in the reflection interface. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 37d3ea1..9355c44 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -99,6 +99,7 @@ struct d3dcompiler_shader_reflection struct d3dcompiler_shader_signature *isgn; struct d3dcompiler_shader_signature *osgn; + struct d3dcompiler_shader_signature *pcsg; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 219050c..89f868b 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -48,6 +48,12 @@ static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) free_signature(ref->osgn); HeapFree(GetProcessHeap(), 0, ref->osgn); } + + if (ref->pcsg) + { + free_signature(ref->pcsg); + HeapFree(GetProcessHeap(), 0, ref->pcsg); + } } static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface) @@ -518,6 +524,23 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_PCSG: + reflection->pcsg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->pcsg)); + if (!reflection->pcsg) + { + ERR("Failed to allocate PCSG memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + hr = d3dcompiler_parse_signature(reflection->pcsg, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse section PCSG.\n"); + goto err_out; + } + break; + default: FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); break;

1 0