June 2012 - Wine-Commits - list.winehq.org

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]ConstantAttenuation.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 2f5608877d524e84b6b00d22054432919b5790a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5608877d524e84b6b00d220… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 13:36:20 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]ConstantAttenuation. --- dlls/d3drm/light.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 12c8623..750bb5f 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -35,6 +35,7 @@ typedef struct { D3DRMLIGHTTYPE type; D3DCOLOR color; D3DVALUE range; + D3DVALUE cattenuation; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -243,9 +244,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetConstantAttenuation(IDirect3DRMLig { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, cattenuation); + TRACE("(%p/%p)->(%f)\n", iface, This, cattenuation); - return E_NOTIMPL; + This->cattenuation = cattenuation; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetLinearAttenuation(IDirect3DRMLight* iface, @@ -299,9 +302,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetConstantAttenuation(IDirect3DRMLi { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->cattenuation; } static D3DVALUE WINAPI IDirect3DRMLightImpl_GetLinearAttenuation(IDirect3DRMLight* iface)

1 0

Jacek Caban : wininet: Added more security flags and errors tests.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: f6fc1e3cac6289cbb87da7d059ca19ae97c811db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fc1e3cac6289cbb87da7d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:40:56 2012 +0200 wininet: Added more security flags and errors tests. --- dlls/wininet/tests/http.c | 68 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fbb7ab6..1d82537 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2937,12 +2937,12 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); } -#define set_secflags(a,b) _set_secflags(__LINE__,a,b) -static void _set_secflags(unsigned line, HINTERNET req, DWORD flags) +#define set_secflags(a,b,c) _set_secflags(__LINE__,a,b,c) +static void _set_secflags(unsigned line, HINTERNET req, BOOL use_undoc, DWORD flags) { BOOL res; - res = InternetSetOptionW(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + res = InternetSetOptionW(req, use_undoc ? 99 : INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); ok_(__FILE__,line)(res, "InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); } @@ -2976,8 +2976,19 @@ static void test_security_flags(void) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); test_secflags_option(req, 0); - set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); - test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + + set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); + + set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + + set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); + test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + + flags = SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_SECURE; + res = InternetSetOptionW(req, 99, &flags, sizeof(flags)); + ok(!res && GetLastError() == ERROR_INTERNET_OPTION_NOT_SETTABLE, "InternetSetOption(99) failed: %u\n", GetLastError()); SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); @@ -3010,8 +3021,8 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); test_request_flags(req, 0); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA| - SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_STRENGTH_STRONG); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA + |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_STRENGTH_STRONG); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -3070,8 +3081,37 @@ static void test_security_flags(void) test_request_flags(req, 8); test_secflags_option(req, 0x800000); - set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA); - test_secflags_option(req, 0x800000|SECURITY_FLAG_IGNORE_UNKNOWN_CA); + set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, 0x800000|SECURITY_FLAG_IGNORE_REVOCATION); + + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + + res = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); + + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); + + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + + test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); + + set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); + test_secflags_option(req, 0x1800000|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA + |SECURITY_FLAG_IGNORE_REVOCATION); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -3101,8 +3141,8 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); test_request_flags(req, 0); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA - |SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION + |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); test_cert_struct(req); @@ -3136,7 +3176,8 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG + |SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -3164,7 +3205,8 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); test_request_flags(req, 0); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG + |SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError());

1 0

André Hentschel : d3drm: Implement IDirect3DRMViewportX_[Get|Set]Back.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: ece2ca78ea8a0106d2a5a938ff5d06c6ba58baed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece2ca78ea8a0106d2a5a938f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 13:43:40 2012 +0200 d3drm: Implement IDirect3DRMViewportX_[Get|Set]Back. --- dlls/d3drm/viewport.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 5122140..d3738ae 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -36,6 +36,7 @@ typedef struct { IDirect3DRMViewport IDirect3DRMViewport_iface; IDirect3DRMViewport2 IDirect3DRMViewport2_iface; LONG ref; + D3DVALUE back; } IDirect3DRMViewportImpl; static inline IDirect3DRMViewportImpl *impl_from_IDirect3DRMViewport(IDirect3DRMViewport *iface) @@ -228,9 +229,9 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_SetBack(IDirect3DRMViewport* iface { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, back); + TRACE("(%p/%p)->(%f)\n", iface, This, back); - return E_NOTIMPL; + return IDirect3DRMViewport2_SetBack(&This->IDirect3DRMViewport2_iface, back); } static HRESULT WINAPI IDirect3DRMViewportImpl_SetField(IDirect3DRMViewport* iface, D3DVALUE field) @@ -421,9 +422,9 @@ static D3DVALUE WINAPI IDirect3DRMViewportImpl_GetBack(IDirect3DRMViewport* ifac { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMViewport2_GetBack(&This->IDirect3DRMViewport2_iface); } static D3DVALUE WINAPI IDirect3DRMViewportImpl_GetFront(IDirect3DRMViewport* iface) @@ -649,9 +650,11 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_SetBack(IDirect3DRMViewport2* ifa { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, back); + TRACE("(%p/%p)->(%f)\n", iface, This, back); - return E_NOTIMPL; + This->back = back; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMViewport2Impl_SetField(IDirect3DRMViewport2* iface, D3DVALUE field) @@ -842,9 +845,9 @@ static D3DVALUE WINAPI IDirect3DRMViewport2Impl_GetBack(IDirect3DRMViewport2* if { IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->back; } static D3DVALUE WINAPI IDirect3DRMViewport2Impl_GetFront(IDirect3DRMViewport2* iface)

1 0

Jacek Caban : wininet: Improved handling ERROR_INTERNET_INVALID_CA error.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: c3eec8dc57de430c3d6ca46a15f0ead2553505b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3eec8dc57de430c3d6ca46a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:40:31 2012 +0200 wininet: Improved handling ERROR_INTERNET_INVALID_CA error. --- dlls/wininet/dialogs.c | 2 ++ dlls/wininet/internet.h | 2 ++ dlls/wininet/netconnection.c | 17 +++++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 68c668e..7bcfb15 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -540,6 +540,8 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( break; case ERROR_INTERNET_SEC_CERT_ERRORS: if(flags & _SECURITY_FLAG_CERT_REV_FAILED) + flags |= SECURITY_FLAG_IGNORE_REVOCATION; + if(flags & _SECURITY_FLAG_CERT_INVALID_CA) flags |= SECURITY_FLAG_IGNORE_UNKNOWN_CA; if(flags & _SECURITY_FLAG_CERT_INVALID_CN) flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a46e185..a25be32 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -560,11 +560,13 @@ typedef struct /* Undocumented security flags */ #define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 +#define _SECURITY_FLAG_CERT_INVALID_CA 0x01000000 #define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 #define _SECURITY_FLAG_CERT_INVALID_DATE 0x04000000 #define _SECURITY_ERROR_FLAGS_MASK \ (_SECURITY_FLAG_CERT_REV_FAILED \ + |_SECURITY_FLAG_CERT_INVALID_CA \ |_SECURITY_FLAG_CERT_INVALID_CN \ |_SECURITY_FLAG_CERT_INVALID_DATE) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 00c3513..47b8453 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -272,12 +272,21 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; } + /* This seems strange, but that's what tests show */ if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); - if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + else + err = conn->mask_errors ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + } + if(conn->mask_errors) { + if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + else + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; }

1 0

Alistair Leslie-Hughes : mscoree: Correct possible uninitialized variable ( clang).
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 85d49c5819fb4494d9f81c56c3504bef5732b726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d49c5819fb4494d9f81c56c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 18:56:53 2012 +1100 mscoree: Correct possible uninitialized variable (clang). --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index d5c94c1..0262757 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1239,7 +1239,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; - ICLRRuntimeInfo *info; + ICLRRuntimeInfo *info = NULL; RuntimeHost *host; HRESULT hr; HKEY key;

1 0

Alistair Leslie-Hughes : mscoree: Use .NET 2.0 for 1.0 assemblies.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: c99754ef15a8e5bc0fd9189fc81e4e4d9cc1f589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99754ef15a8e5bc0fd9189fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 7 11:58:41 2012 +1000 mscoree: Use .NET 2.0 for 1.0 assemblies. --- dlls/mscoree/metahost.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fa12853..8417344 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -45,7 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0}; static const WCHAR net_40_subdir[] = {'4','.','0',0}; @@ -54,7 +53,7 @@ static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; #define NUM_RUNTIMES 3 static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { - {{&CLRRuntimeInfoVtbl}, net_11_subdir, 1, 1, 4322, 0}, + {{&CLRRuntimeInfoVtbl}, net_20_subdir, 1, 1, 4322, 0}, {{&CLRRuntimeInfoVtbl}, net_20_subdir, 2, 0, 50727, 0}, {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} }; @@ -123,14 +122,9 @@ MonoImage* (CDECL * const image_from_handle_fn[NUM_ABI_VERSIONS])(HMODULE module image_open_module_handle_dummy_2 }; -static void missing_runtime_message(const CLRRuntimeInfo *This) +static void missing_runtime_message(void) { - if (This->major == 1) - MESSAGE("wine: Install Mono 2.6 for Windows to run .NET 1.1 applications.\n"); - else if (This->major == 2) - MESSAGE("wine: Install Mono for Windows to run .NET 2.0 applications.\n"); - else if (This->major == 4) - MESSAGE("wine: Install Mono 2.8 or greater for Windows to run .NET 4.0 applications.\n"); + MESSAGE("wine: Install Mono for Windows to run .NET applications.\n"); } static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) @@ -147,7 +141,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if (This->mono_abi_version <= 0 || This->mono_abi_version > NUM_ABI_VERSIONS) { - missing_runtime_message(This); + missing_runtime_message(); return E_FAIL; } @@ -1078,7 +1072,7 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, ppRuntime); else { - missing_runtime_message(&runtimes[i]); + missing_runtime_message(); return CLR_E_SHIM_RUNTIME; } } @@ -1390,10 +1384,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, } } - if (legacy) - missing_runtime_message(&runtimes[1]); - else - missing_runtime_message(&runtimes[NUM_RUNTIMES-1]); + missing_runtime_message(); return CLR_E_SHIM_RUNTIME; }

1 0

Erich Hoover : ws2_32: Use STATUS_MORE_PROCESSING_REQUIRED to indicate that the AcceptEx async should not send a completion .
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 7e9e8b6b800f7a0393b6a0d4b1a893d9ae78e262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9e8b6b800f7a0393b6a0d4b… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jun 6 17:35:32 2012 -0600 ws2_32: Use STATUS_MORE_PROCESSING_REQUIRED to indicate that the AcceptEx async should not send a completion. --- dlls/ws2_32/socket.c | 9 ++++--- dlls/ws2_32/tests/sock.c | 50 +++++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 447d501..fd19ab2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1706,7 +1706,9 @@ static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS sta if (status != STATUS_PENDING) goto finish; - return STATUS_SUCCESS; + /* The APC has finished but no completion should be sent for the operation yet, additional processing + * needs to be performed by WS2_async_accept_recv() first. */ + return STATUS_MORE_PROCESSING_REQUIRED; finish: iosb->u.Status = status; @@ -1714,8 +1716,6 @@ finish: if (wsa->user_overlapped->hEvent) SetEvent(wsa->user_overlapped->hEvent); - if (wsa->cvalue) - WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information ); *apc = ws2_async_accept_apc; return status; @@ -2046,7 +2046,8 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW req->async.callback = wine_server_client_ptr( WS2_async_accept ); req->async.iosb = wine_server_client_ptr( overlapped ); req->async.arg = wine_server_client_ptr( wsa ); - /* We don't set event or completion since we may also have to read */ + req->async.cvalue = cvalue; + /* We don't set event since we may also have to read */ status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f87a3f2..85d126b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5494,11 +5494,11 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5537,11 +5537,11 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5596,11 +5596,11 @@ static void test_completion_port(void) olp = (WSAOVERLAPPED *)0xdeadbeef; bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && olp->Internal == (ULONG)STATUS_CANCELLED, "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && olp->Internal == (ULONG)STATUS_CANCELLED, "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5663,11 +5663,11 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5719,11 +5719,11 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + ok(key == 125, "Key is %lu\n", key); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

Erich Hoover : server: STATUS_MORE_PROCESSING_REQUIRED indicates that an async operation should not send a completion .
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 93552cc3df52dfd8130ae72361ad277fd1187a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=93552cc3df52dfd8130ae7236… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jun 6 17:35:08 2012 -0600 server: STATUS_MORE_PROCESSING_REQUIRED indicates that an async operation should not send a completion. --- server/async.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/async.c b/server/async.c index 843a02b..ccddec7 100644 --- a/server/async.c +++ b/server/async.c @@ -243,6 +243,9 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, unsigned int status, unsigned int information ) { + if (status == STATUS_MORE_PROCESSING_REQUIRED) + return; /* The async callback has successfully finished but no completion should be reported */ + if (queue->fd) { apc_param_t ckey;

1 0

Aric Stewart : quartz: Hookup the VMR-9 to directX and the Allocator-Presenter.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: ac421e33415ff8ba6aa4589a96043933a53ef757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac421e33415ff8ba6aa4589a9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 6 13:47:26 2012 -0500 quartz: Hookup the VMR-9 to directX and the Allocator-Presenter. --- dlls/quartz/vmr9.c | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 356 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac421e33415ff8ba6aa45…

1 0

Aric Stewart : quartz: Create the rendering window for VMR-9.
by Alexandre Julliard June 7, 2012

June 7, 2012

Module: wine Branch: master Commit: 583d9155205646805b02f64613bd1d592c56037e URL: http://source.winehq.org/git/wine.git/?a=commit;h=583d9155205646805b02f6461… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 6 13:47:20 2012 -0500 quartz: Create the rendering window for VMR-9. --- dlls/quartz/vmr9.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 160 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8fa1b15..db756a3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -130,6 +130,10 @@ typedef struct LONG refCount; + HANDLE ack; + DWORD tid; + HANDLE hWndThread; + IDirect3DDevice9 *d3d9_dev; IDirect3D9 *d3d9_ptr; IDirect3DSurface9 **d3d9_surfaces; @@ -1355,6 +1359,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) { int i; TRACE("Destroying\n"); + CloseHandle(This->ack); IUnknown_Release(This->d3d9_ptr); TRACE("Number of surfaces: %u\n", This->num_surfaces); @@ -1544,6 +1549,85 @@ static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); } +static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(VMR9DefaultAllocatorPresenterImpl *This, VMR9AllocationInfo *allocinfo) +{ + D3DCAPS9 caps; + UINT width, height; + HRESULT hr; + + if (!(allocinfo->dwFlags & VMR9AllocFlag_TextureSurface)) + /* Only needed for texture surfaces */ + return S_OK; + + hr = IDirect3DDevice9_GetDeviceCaps(This->d3d9_dev, &caps); + if (FAILED(hr)) + return hr; + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_POW2) || (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY)) + { + width = allocinfo->dwWidth; + height = allocinfo->dwHeight; + } + else + { + width = height = 1; + while (width < allocinfo->dwWidth) + width *= 2; + + while (height < allocinfo->dwHeight) + height *= 2; + FIXME("NPOW2 support missing, not using proper surfaces!\n"); + } + + if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) + { + if (height > width) + width = height; + else + height = width; + FIXME("Square texture support required..\n"); + } + + hr = IDirect3DDevice9_CreateVertexBuffer(This->d3d9_dev, 4 * sizeof(struct VERTEX), D3DUSAGE_WRITEONLY, USED_FVF, allocinfo->Pool, &This->d3d9_vertex, NULL); + if (FAILED(hr)) + { + ERR("Couldn't create vertex buffer: %08x\n", hr); + return hr; + } + + This->reset = TRUE; + allocinfo->dwHeight = height; + allocinfo->dwWidth = width; + + return hr; +} + +static DWORD WINAPI MessageLoop(LPVOID lpParameter) +{ + MSG msg; + BOOL fGotMessage; + VMR9DefaultAllocatorPresenterImpl *This = lpParameter; + + TRACE("Starting message loop\n"); + + if (FAILED(BaseWindowImpl_PrepareWindow(&This->pVMR9->baseControlWindow.baseWindow))) + { + FIXME("Failed to prepare window\n"); + return FALSE; + } + + SetEvent(This->ack); + while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + TRACE("End of message loop\n"); + + return 0; +} + static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_out) { UINT d3d9_adapter; @@ -1567,6 +1651,68 @@ static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_ou return d3d9_adapter; } +static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9AllocationInfo *info, DWORD *numbuffers) +{ + D3DPRESENT_PARAMETERS d3dpp; + DWORD d3d9_adapter; + HRESULT hr; + + TRACE("(%p)->()\n", This); + + This->hWndThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->tid); + if (!This->hWndThread) + return FALSE; + + WaitForSingleObject(This->ack, INFINITE); + + if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) return FALSE; + + /* Obtain a monitor and d3d9 device */ + d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.baseWindow.hWnd, &This->hMon); + + /* Now try to create the d3d9 device */ + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.hDeviceWindow = This->pVMR9->baseControlWindow.baseWindow.hWnd; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferHeight = This->pVMR9->target_rect.bottom - This->pVMR9->target_rect.top; + d3dpp.BackBufferWidth = This->pVMR9->target_rect.right - This->pVMR9->target_rect.left; + + hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter, D3DDEVTYPE_HAL, NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); + if (FAILED(hr)) + { + ERR("Could not create device: %08x\n", hr); + BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); + return FALSE; + } + IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); + + This->d3d9_surfaces = CoTaskMemAlloc(*numbuffers * sizeof(IDirect3DSurface9 *)); + ZeroMemory(This->d3d9_surfaces, *numbuffers * sizeof(IDirect3DSurface9 *)); + + hr = VMR9_SurfaceAllocator_SetAllocationSettings(This, info); + if (FAILED(hr)) + ERR("Setting allocation settings failed: %08x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(This->SurfaceAllocatorNotify, info, numbuffers, This->d3d9_surfaces); + if (FAILED(hr)) + ERR("Allocating surfaces failed: %08x\n", hr); + } + + if (FAILED(hr)) + { + IVMRSurfaceAllocatorEx9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); + BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); + return FALSE; + } + + This->num_surfaces = *numbuffers; + + return TRUE; +} + static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); @@ -1578,21 +1724,29 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato } This->info = *allocinfo; - return E_NOTIMPL; + + if (!CreateRenderingWindow(This, allocinfo, numbuffers)) + { + ERR("Failed to create rendering window, expect no output!\n"); + return VFW_E_WRONG_STATE; + } + + return S_OK; } static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - HRESULT hr; if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) { return S_OK; } - hr = SendMessageW(This->pVMR9->baseControlWindow.baseWindow.hWnd, WM_CLOSE, 0, 0); - FIXME("SendMessageW: %08x\n", hr); + SendMessageW(This->pVMR9->baseControlWindow.baseWindow.hWnd, WM_CLOSE, 0, 0); + PostThreadMessageW(This->tid, WM_QUIT, 0, 0); + WaitForSingleObject(This->hWndThread, INFINITE); + This->hWndThread = NULL; BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); return S_OK; @@ -1800,6 +1954,8 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(VMR9Impl *parent, LPVOID This->hMon = 0; This->d3d9_vertex = NULL; This->num_surfaces = 0; + This->hWndThread = NULL; + This->ack = CreateEventW(NULL, 0, 0, NULL); This->SurfaceAllocatorNotify = NULL; This->reset = FALSE;

1 0