wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Jacek Caban : wininet: Use schannel in NETCON_secure_connect if OpenSSL is not available.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 952588eac43244871c22e769e7027636ca45d932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952588eac43244871c22e769e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 14:03:13 2013 +0200 wininet: Use schannel in NETCON_secure_connect if OpenSSL is not available. --- dlls/wininet/internet.h | 5 + dlls/wininet/netconnection.c | 206 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 208 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c423fb6..9fbb74f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -92,7 +92,12 @@ typedef struct int socket; BOOL secure; void *ssl_s; + CtxtHandle ssl_ctx; + SecPkgContext_StreamSizes ssl_sizes; server_t *server; + char *ssl_buf; + char *extra_buf; + size_t extra_len; DWORD security_flags; BOOL mask_errors; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 17518b9..e896d84 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -214,6 +214,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } +#endif /* SONAME_LIBSSL */ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTORE store) { @@ -372,6 +373,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR return ERROR_SUCCESS; } +#ifdef SONAME_LIBSSL static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; @@ -603,6 +605,55 @@ static DWORD init_openssl(void) return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; #endif } +#else + +static SecHandle cred_handle, compat_cred_handle; +static BOOL cred_handle_initialized, have_compat_cred_handle; + +static CRITICAL_SECTION init_sechandle_cs; +static CRITICAL_SECTION_DEBUG init_sechandle_cs_debug = { + 0, 0, &init_sechandle_cs, + { &init_sechandle_cs_debug.ProcessLocksList, + &init_sechandle_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": init_sechandle_cs") } +}; +static CRITICAL_SECTION init_sechandle_cs = { &init_sechandle_cs_debug, -1, 0, 0, 0, 0 }; + +static BOOL ensure_cred_handle(void) +{ + SECURITY_STATUS res = SEC_E_OK; + + EnterCriticalSection(&init_sechandle_cs); + + if(!cred_handle_initialized) { + SCHANNEL_CRED cred = {SCHANNEL_CRED_VERSION}; + SecPkgCred_SupportedProtocols prots; + + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, + NULL, NULL, &cred_handle, NULL); + if(res == SEC_E_OK) { + res = QueryCredentialsAttributesA(&cred_handle, SECPKG_ATTR_SUPPORTED_PROTOCOLS, &prots); + if(res != SEC_E_OK || (prots.grbitProtocol & SP_PROT_TLS1_1PLUS_CLIENT)) { + cred.grbitEnabledProtocols = prots.grbitProtocol & ~SP_PROT_TLS1_1PLUS_CLIENT; + res = AcquireCredentialsHandleW(NULL, (WCHAR*)UNISP_NAME_W, SECPKG_CRED_OUTBOUND, NULL, &cred, + NULL, NULL, &compat_cred_handle, NULL); + have_compat_cred_handle = res == SEC_E_OK; + } + } + + cred_handle_initialized = res == SEC_E_OK; + } + + LeaveCriticalSection(&init_sechandle_cs); + + if(res != SEC_E_OK) { + WARN("Failed: %08x\n", res); + return FALSE; + } + + return TRUE; +} + #endif /* SONAME_LIBSSL */ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) @@ -707,6 +758,10 @@ void free_netconn(netconn_t *netconn) #ifdef SONAME_LIBSSL pSSL_shutdown(netconn->ssl_s); pSSL_free(netconn->ssl_s); +#else + heap_free(netconn->ssl_buf); + netconn->ssl_buf = NULL; + DeleteSecurityContext(&netconn->ssl_ctx); #endif } @@ -738,6 +793,12 @@ void NETCON_unload(void) } heap_free(ssl_locks); } +#else + if(cred_handle_initialized) + FreeCredentialsHandle(&cred_handle); + if(have_compat_cred_handle) + FreeCredentialsHandle(&compat_cred_handle); + DeleteCriticalSection(&init_sechandle_cs); #endif } @@ -861,6 +922,147 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } connection->ssl_s = ssl_s; +#else + SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; + SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; + SecHandle *cred = &cred_handle; + BYTE *read_buf; + SIZE_T read_buf_size = 2048; + ULONG attrs = 0; + CtxtHandle ctx; + SSIZE_T size; + int bits; + const CERT_CONTEXT *cert; + SECURITY_STATUS status; + DWORD res = ERROR_SUCCESS; + + const DWORD isc_req_flags = ISC_REQ_ALLOCATE_MEMORY|ISC_REQ_USE_SESSION_KEY|ISC_REQ_CONFIDENTIALITY + |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; + + if(!ensure_cred_handle()) + return FALSE; + + if(compat_mode) { + if(!have_compat_cred_handle) + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + cred = &compat_cred_handle; + } + + read_buf = heap_alloc(read_buf_size); + if(!read_buf) + return ERROR_OUTOFMEMORY; + + status = InitializeSecurityContextW(cred, NULL, connection->server->name, isc_req_flags, 0, 0, NULL, 0, + &ctx, &out_desc, &attrs, NULL); + + assert(status != SEC_E_OK); + + while(status == SEC_I_CONTINUE_NEEDED || status == SEC_E_INCOMPLETE_MESSAGE) { + if(out_buf.cbBuffer) { + assert(status == SEC_I_CONTINUE_NEEDED); + + TRACE("sending %u bytes\n", out_buf.cbBuffer); + + size = send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + if(size != out_buf.cbBuffer) { + ERR("send failed\n"); + status = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + break; + } + + FreeContextBuffer(out_buf.pvBuffer); + out_buf.pvBuffer = NULL; + out_buf.cbBuffer = 0; + } + + if(status == SEC_I_CONTINUE_NEEDED) { + assert(in_bufs[1].cbBuffer < read_buf_size); + + memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer); + in_bufs[0].cbBuffer = in_bufs[1].cbBuffer; + + in_bufs[1].BufferType = SECBUFFER_EMPTY; + in_bufs[1].cbBuffer = 0; + in_bufs[1].pvBuffer = NULL; + } + + assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); + assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + + if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { + BYTE *new_read_buf; + + new_read_buf = heap_realloc(read_buf, read_buf_size + 1024); + if(!new_read_buf) { + status = E_OUTOFMEMORY; + break; + } + + in_bufs[0].pvBuffer = read_buf = new_read_buf; + read_buf_size += 1024; + } + + size = recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + if(size < 1) { + WARN("recv error\n"); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + break; + } + + TRACE("recv %lu bytes\n", size); + + in_bufs[0].cbBuffer += size; + in_bufs[0].pvBuffer = read_buf; + status = InitializeSecurityContextW(cred, &ctx, connection->server->name, isc_req_flags, 0, 0, &in_desc, + 0, NULL, &out_desc, &attrs, NULL); + TRACE("InitializeSecurityContext ret %08x\n", status); + + if(status == SEC_E_OK) { + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) + FIXME("SECBUFFER_EXTRA not supported\n"); + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_STREAM_SIZES, &connection->ssl_sizes); + if(status != SEC_E_OK) { + WARN("Could not get sizes\n"); + break; + } + + status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); + if(status == SEC_E_OK) { + res = netconn_verify_cert(connection, cert, cert->hCertStore); + CertFreeCertificateContext(cert); + if(res != ERROR_SUCCESS) { + WARN("cert verify failed: %u\n", res); + break; + } + }else { + WARN("Could not get cert\n"); + break; + } + + connection->ssl_buf = heap_alloc(connection->ssl_sizes.cbHeader + connection->ssl_sizes.cbMaximumMessage + + connection->ssl_sizes.cbTrailer); + if(!connection->ssl_buf) { + res = GetLastError(); + break; + } + } + } + + + if(status != SEC_E_OK || res != ERROR_SUCCESS) { + WARN("Failed to initialize security context failed: %08x\n", status); + heap_free(connection->ssl_buf); + connection->ssl_buf = NULL; + DeleteSecurityContext(&ctx); + return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + } + + + TRACE("established SSL connection\n"); + connection->ssl_ctx = ctx; +#endif + connection->secure = TRUE; connection->security_flags |= SECURITY_FLAG_SECURE; @@ -876,6 +1078,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; +#ifdef SONAME_LIBSSL fail: if (ssl_s) { @@ -883,9 +1086,6 @@ fail: pSSL_free(ssl_s); } return res; -#else - FIXME("Cannot connect, OpenSSL not available.\n"); - return ERROR_NOT_SUPPORTED; #endif }

1 0

André Hentschel : uxtheme/tests: Don' t test for themed app.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: f5c49aaf83db5356c18c6da4a1df573713c224eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c49aaf83db5356c18c6da4a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 2 15:42:26 2013 +0200 uxtheme/tests: Don't test for themed app. --- dlls/uxtheme/tests/system.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 8dd413b..303ff8d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -81,24 +81,11 @@ static void test_IsThemed(void) BOOL bAppThemed; BOOL bTPDefined; - SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); - /* This test is not themed */ - SetLastError(0xdeadbeef); bAppThemed = pIsAppThemed(); - - if (bThemeActive) - todo_wine - ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - else - /* Although Wine currently returns FALSE, the logic behind it is wrong. It is not a todo_wine though in the testing sense */ - ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); SetLastError(0xdeadbeef); bTPDefined = pIsThemePartDefined(NULL, 0 , 0);

1 0

Jacek Caban : ieframe: Added GoForward tests.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 47f8d487679170a2c686aac6028fd06adffe5e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f8d487679170a2c686aac60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 3 13:04:46 2013 +0200 ieframe: Added GoForward tests. --- dlls/ieframe/tests/webbrowser.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 39bc21d..753a1680 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -160,8 +160,9 @@ static int wb_version; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 #define DWL_FROM_PUT_HREF 0x02 #define DWL_FROM_GOBACK 0x04 -#define DWL_HTTP 0x08 -#define DWL_REFRESH 0x10 +#define DWL_FROM_GOFORWARD 0x08 +#define DWL_HTTP 0x10 +#define DWL_REFRESH 0x20 static DWORD dwl_flags; @@ -786,7 +787,8 @@ static void test_navigatecomplete2(DISPPARAMS *dp) ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1)); ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb); - test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD)) + ? READYSTATE_COMPLETE : READYSTATE_LOADING); } static void test_documentcomplete(DISPPARAMS *dp) @@ -857,7 +859,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_OnBeforeNavigate(pDispParams->rgvarg+6, pDispParams->rgvarg+5, pDispParams->rgvarg+4, pDispParams->rgvarg+3, pDispParams->rgvarg+2, pDispParams->rgvarg+1, pDispParams->rgvarg); - test_ready_state((dwl_flags & DWL_FROM_PUT_HREF) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOFORWARD)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); break; case DISPID_SETSECURELOCKICON: @@ -2721,9 +2723,10 @@ static void test_download(DWORD flags) is_downloading = TRUE; dwl_flags = flags; - test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) + ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2765,7 +2768,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2946,6 +2949,21 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); } +static void test_go_forward(IWebBrowser2 *wb, const char *forward_url) +{ + HRESULT hres; + + current_url = forward_url; + dwl_flags |= DWL_FROM_GOFORWARD; + + SET_EXPECT(Invoke_BEFORENAVIGATE2); + SET_EXPECT(Invoke_COMMANDSTATECHANGE); + hres = IWebBrowser2_GoForward(wb); + ok(hres == S_OK, "GoForward failed: %08x\n", hres); + CHECK_CALLED(Invoke_BEFORENAVIGATE2); + todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); +} + static void test_QueryInterface(IWebBrowser2 *wb) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; @@ -3309,6 +3327,7 @@ static void init_test(IWebBrowser2 *webbrowser, DWORD flags) is_downloading = (flags & TEST_DOWNLOAD) != 0; is_first_load = TRUE; + dwl_flags = 0; use_container_olecmd = !(flags & TEST_NOOLECMD); use_container_dochostui = !(flags & TEST_NODOCHOST); } @@ -3377,6 +3396,10 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) trace("GoBack...\n"); test_go_back(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_FROM_GOBACK|DWL_HTTP); + + trace("GoForward...\n"); + test_go_forward(webbrowser, "http://www.winehq.org/"); + test_download(DWL_FROM_GOFORWARD|DWL_HTTP); } test_EnumVerbs(webbrowser); @@ -3398,7 +3421,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_IServiceProvider(webbrowser); ref = IWebBrowser2_Release(webbrowser); - ok(ref == 0 || broken(do_download && !do_close && ref == 1), "ref=%d, expected 0\n", ref); + ok(ref == 0 || broken(do_download && !do_close), "ref=%d, expected 0\n", ref); } static void test_WebBrowserV1(void)

1 0

Dmitry Timoshkov : wineps.drv: Constify a variable.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 1b55e50e205ba87ae45228bb999ef921f4666900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b55e50e205ba87ae45228bb9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 3 16:37:51 2013 +0900 wineps.drv: Constify a variable. --- dlls/wineps.drv/type1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 6855019..316bece 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -75,7 +75,7 @@ TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) char *buf; TYPE1 *t1; - char dict[] = /* name, emsquare, fontbbox */ + static const char dict[] = /* name, emsquare, fontbbox */ "25 dict begin\n" " /FontName /%s def\n" " /Encoding 256 array 0 1 255{1 index exch /.notdef put} for def\n"

1 0

Sam Edwards : ddraw/tests: Verify window style after exiting fullscreen mode.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: d1b67698b97e79a723eab70f2343054fecd6307c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b67698b97e79a723eab70f2… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 2 17:55:21 2013 -0600 ddraw/tests: Verify window style after exiting fullscreen mode. --- dlls/ddraw/tests/ddraw1.c | 8 ++++++++ dlls/ddraw/tests/ddraw2.c | 8 ++++++++ dlls/ddraw/tests/ddraw4.c | 8 ++++++++ dlls/ddraw/tests/ddraw7.c | 8 ++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d3a296c..fa550f4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1898,6 +1898,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index a52cb78..8bb33fc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2105,6 +2105,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 55b6c01..742bd3f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2220,6 +2220,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 027e03a..3d8c70d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1952,6 +1952,14 @@ static void test_window_style(void) GetClientRect(window, &r); todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : d3d8/tests: Verify window style after exiting fullscreen mode .
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: ce6173264dd6bdc91f414056ae8a623577bed5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6173264dd6bdc91f414056a… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Apr 1 17:02:56 2013 -0600 d3d8/tests: Verify window style after exiting fullscreen mode. --- dlls/d3d8/tests/device.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fbc2d19..ba7e5e6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2829,6 +2829,7 @@ static void test_window_style(void) LONG style, expected_style; IDirect3DDevice8 *device; IDirect3D8 *d3d8; + HRESULT hr; ULONG ref; @@ -2885,6 +2886,26 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom); + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : d3d9/tests: Verify window style after exiting fullscreen mode .
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 8157aa143b74f26dad9b41bfe719647828322c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8157aa143b74f26dad9b41bfe… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Apr 1 17:03:50 2013 -0600 d3d9/tests: Verify window style after exiting fullscreen mode. --- dlls/d3d9/tests/device.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bbbcbbc..f30938b 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3130,6 +3130,7 @@ static void test_window_style(void) LONG style, expected_style; IDirect3DDevice9 *device; IDirect3D9 *d3d9; + HRESULT hr; ULONG ref; @@ -3186,6 +3187,25 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom); + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | WS_VISIBLE; + ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | WS_EX_TOPMOST; + ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Sam Edwards : wined3d: Ignore WS_VISIBLE and WS_EX_TOPMOST when dropping out of fullscreen.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 6c43f90c50cb1c231beb4add3dcf869c83389b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c43f90c50cb1c231beb4add3… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Sun Mar 31 18:25:27 2013 -0600 wined3d: Ignore WS_VISIBLE and WS_EX_TOPMOST when dropping out of fullscreen. --- dlls/wined3d/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bca5a54..e4b970c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1044,12 +1044,21 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic if (!device->style && !device->exStyle) return; - TRACE("Restoring window style of window %p to %08x, %08x.\n", - window, device->style, device->exStyle); - style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); + /* These flags are set by wined3d_device_setup_fullscreen_window, not the + * application, and we want to ignore them in the test below, since it's + * not the application's fault that they changed. Additionally, we want to + * preserve the current status of these flags (i.e. don't restore them) to + * more closely emulate the behavior of Direct3D, which leaves these flags + * alone when returning to windowed mode. */ + device->style ^= (device->style ^ style) & WS_VISIBLE; + device->exStyle ^= (device->exStyle ^ exstyle) & WS_EX_TOPMOST; + + TRACE("Restoring window style of window %p to %08x, %08x.\n", + window, device->style, device->exStyle); + filter_messages = device->filter_messages; device->filter_messages = TRUE;

1 0

Sam Edwards : wined3d: Make fullscreen windows use HWND_TOPMOST instead of HWND_TOP.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: 6ab0ff5b9d2c681246257787da9f3fa4c9268b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab0ff5b9d2c681246257787d… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Sun Mar 31 18:25:18 2013 -0600 wined3d: Make fullscreen windows use HWND_TOPMOST instead of HWND_TOP. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7874ba..bca5a54 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1032,7 +1032,7 @@ void CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); device->filter_messages = filter_messages; }

1 0

Jérôme Gardou : wined3d: Initialize adapter device name even if opengl is not used.
by Alexandre Julliard 03 Apr '13

03 Apr '13

Module: wine Branch: master Commit: b7649efb2df134aaac523c8c2e6587a7cff0f1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7649efb2df134aaac523c8c2… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Tue Apr 2 15:04:57 2013 +0200 wined3d: Initialize adapter device name even if opengl is not used. --- dlls/wined3d/directx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b6bc8e..4b42845 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5237,6 +5237,8 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) { + DISPLAY_DEVICEW display_device; + memset(adapter, 0, sizeof(*adapter)); adapter->ordinal = ordinal; adapter->monitorPoint.x = -1; @@ -5254,6 +5256,11 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; adapter->blitter = &cpu_blit; + + display_device.cb = sizeof(display_device); + EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); + TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + strcpyW(adapter->DeviceName, display_device.DeviceName); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {}

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
58
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 April 2013