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

Frédéric Delanoy : French translation for release 1.5.5
by Jeremy Newman May 29, 2012

May 29, 2012

Module: website Branch: master Commit: c1722b0fbc6c304b6db40e4377ea4916e233c31d URL: http://source.winehq.org/git/website.git/?a=commit;h=c1722b0fbc6c304b6db40e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 25 22:59:25 2012 +0200 French translation for release 1.5.5 --- news/fr/2012052501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012052501.xml b/news/fr/2012052501.xml new file mode 100644 index 0000000..154ec92 --- /dev/null +++ b/news/fr/2012052501.xml @@ -0,0 +1,15 @@ +<news> +<date>25 mai 2012</date> +<title>Sortie de Wine 1.5.5</title> +<body> + La version de développement 1.5.5 de Wine est disponible. + <a href="{$root}/announce/1.5.5">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de l'installation de Mono comme module externe à Wine.</li> + <li>Tramage des brosses modèles dans le moteur DIB.</li> + <li>Prise en charge de l'installation du moteur d'exécution .NET 4.0.</li> + <li>Fichiers DDS pris en charge dans D3DX9.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.5
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: website Branch: master Commit: d1d9cc5691a5b4be738619e2c580513443e1108c URL: http://source.winehq.org/git/website.git/?a=commit;h=d1d9cc5691a5b4be738619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:31:17 2012 +0200 Wine release 1.5.5 --- news/en/2012052501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2012052501.xml b/news/en/2012052501.xml new file mode 100644 index 0000000..6e84d18 --- /dev/null +++ b/news/en/2012052501.xml @@ -0,0 +1,16 @@ +<news> +<date>May 25, 2012</date> +<title>Wine 1.5.5 Released</title> +<body> + The Wine development release 1.5.5 is now available. + <a href="{$root}/announce/1.5.5">What's new</a> in this release: +<ul> + <li>Support for installing Mono as a Wine add-on package.</li> + <li>Dithering of pattern brushes in the DIB engine.</li> + <li>Support for installing the .NET 4.0 runtime.</li> + <li>DDS files supported in D3DX9.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.5 : Alexandre Julliard : Release 1.5.5
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: refs/tags/wine-1.5.5 Tag: 351d36d9209d7d17bb7bf3c406a9c63c4662a53a URL: http://source.winehq.org/git/wine.git/?a=tag;h=351d36d9209d7d17bb7bf3c406a9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:21:16 2012 +0200 Release 1.5.5

1 0

Alexandre Julliard : Release 1.5.5.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: d6bc74fc5f0727f12788aa76d286d74f28208589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bc74fc5f0727f12788aa76d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 20:21:15 2012 +0200 Release 1.5.5. --- ANNOUNCE | 906 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 513 insertions(+), 413 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6bc74fc5f0727f12788a…

1 0

Jacek Caban : wininet: Added INTERNET_OPTION_SETTINGS_CHANGED semi-stub implementation.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: f8f2273b7c0c9c55c6060d10b7ceb6df2618d50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f2273b7c0c9c55c6060d10b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:35:48 2012 +0200 wininet: Added INTERNET_OPTION_SETTINGS_CHANGED semi-stub implementation. --- dlls/wininet/http.c | 8 ++++---- dlls/wininet/internet.c | 7 ++++++- dlls/wininet/internet.h | 8 +++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e32dde6..6472c3c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -285,7 +285,7 @@ static server_t *get_server(const WCHAR *name, INTERNET_PORT port) return server; } -BOOL collect_connections(BOOL collect_all) +BOOL collect_connections(collect_type_t collect_type) { netconn_t *netconn, *netconn_safe; server_t *server, *server_safe; @@ -296,7 +296,7 @@ BOOL collect_connections(BOOL collect_all) LIST_FOR_EACH_ENTRY_SAFE(server, server_safe, &connection_pool, server_t, entry) { LIST_FOR_EACH_ENTRY_SAFE(netconn, netconn_safe, &server->conn_pool, netconn_t, pool_entry) { - if(collect_all || netconn->keep_until < now) { + if(collect_type > COLLECT_TIMEOUT || netconn->keep_until < now) { TRACE("freeing %p\n", netconn); list_remove(&netconn->pool_entry); free_netconn(netconn); @@ -305,7 +305,7 @@ BOOL collect_connections(BOOL collect_all) } } - if(collect_all) { + if(collect_type == COLLECT_CLEANUP) { list_remove(&server->entry); list_init(&server->entry); server_release(server); @@ -325,7 +325,7 @@ static DWORD WINAPI collect_connections_proc(void *arg) EnterCriticalSection(&connection_pool_cs); - remaining_conns = collect_connections(FALSE); + remaining_conns = collect_connections(COLLECT_TIMEOUT); if(!remaining_conns) collector_running = FALSE; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a41225f..7ca4b0b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -309,7 +309,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: - collect_connections(TRUE); + collect_connections(COLLECT_CLEANUP); NETCON_unload(); URLCacheContainers_DeleteAll(); @@ -2635,6 +2635,11 @@ static DWORD set_global_option(DWORD option, void *buf, DWORD size) connect_timeout = *(ULONG*)buf; return ERROR_SUCCESS; + + case INTERNET_OPTION_SETTINGS_CHANGED: + FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n"); + collect_connections(COLLECT_CONNECTIONS); + return ERROR_SUCCESS; } return ERROR_INTERNET_INVALID_OPTION; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 30869d9..14228cb 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -70,7 +70,13 @@ typedef struct { void server_addref(server_t*) DECLSPEC_HIDDEN; void server_release(server_t*) DECLSPEC_HIDDEN; -BOOL collect_connections(BOOL) DECLSPEC_HIDDEN; + +typedef enum { + COLLECT_TIMEOUT, + COLLECT_CONNECTIONS, + COLLECT_CLEANUP +} collect_type_t; +BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; /* used for netconnection.c stuff */ typedef struct

1 0

Jacek Caban : wininet: Store certificate error information in security flags.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 868575a416fd4a2236cedfc689049f6ca390efe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868575a416fd4a2236cedfc68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:51:20 2012 +0200 wininet: Store certificate error information in security flags. --- dlls/wininet/http.c | 18 +---- dlls/wininet/internet.h | 11 ++- dlls/wininet/netconnection.c | 188 ++++++++++++++++++++++++----------------- 3 files changed, 123 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=868575a416fd4a2236ced…

1 0

Dmitry Timoshkov : windowscodecs: Add some tests for IFD metadata reader.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 30fc8a553dd6aff5c1315af29d490860029f39b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fc8a553dd6aff5c1315af29… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 25 19:14:05 2012 +0900 windowscodecs: Add some tests for IFD metadata reader. --- dlls/windowscodecs/tests/metadata.c | 154 +++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 09e26ca..d4249f42 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Vincent Povirk for CodeWeavers + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,47 @@ } \ } while (0) +#define IFD_SHORT 3 +#define IFD_LONG 4 +#define IFD_RATIONAL 5 + +#include "pshpack2.h" +struct IFD_entry +{ + SHORT id; + SHORT type; + ULONG length; + LONG value; +}; + +struct IFD_rational +{ + ULONG numerator; + ULONG denominator; +}; + +static const struct +{ + USHORT number_of_entries; + struct IFD_entry entry[6]; + ULONG next_IFD; + struct IFD_rational rational; +} IFD_data = +{ + 6, + { + { 0xfe, IFD_SHORT, 1, 1 }, + { 0x100, IFD_LONG, 1, 222 }, + { 0x101, IFD_LONG, 1, 333 }, + { 0x102, IFD_SHORT, 1, 24 }, + { 0x103, IFD_LONG, 1, 32773 }, + { 0x11a, IFD_RATIONAL, 1, sizeof(USHORT) + sizeof(struct IFD_entry) * 6 + sizeof(ULONG) } + }, + 0, + { 300, 1 } +}; +#include "poppack.h" + static const char metadata_unknown[] = "lalala"; static const char metadata_tEXt[] = { @@ -275,6 +317,117 @@ static void test_metadata_tEXt(void) IWICMetadataReader_Release(reader); } +static void test_metadata_IFD(void) +{ + static const struct test_data + { + ULONG type, id, value; + } td[6] = + { + { VT_UI2, 0xfe, 1 }, + { VT_UI4, 0x100, 222 }, + { VT_UI4, 0x101, 333 }, + { VT_UI2, 0x102, 24 }, + { VT_UI4, 0x103, 32773 }, + { VT_UI8, 0x11a, 300 } + }; + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + PROPVARIANT schema, id, value; + ULONG items_returned, count, i; + GUID format; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + if (FAILED(hr)) return; + + hr = IWICMetadataReader_GetCount(reader, NULL); + ok(hr == E_INVALIDARG, "GetCount error %#x\n", hr); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 0, "unexpected count %u\n", count); + + load_stream((IUnknown*)reader, (const char *)&IFD_data, sizeof(IFD_data)); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == 6, "unexpected count %u\n", count); + + hr = IWICMetadataReader_GetEnumerator(reader, NULL); + ok(hr == E_INVALIDARG, "GetEnumerator error %#x\n", hr); + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + ok(hr == S_OK, "GetEnumerator error %#x\n", hr); + + for (i = 0; i < count; i++) + { + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_OK, "Next error %#x\n", hr); + ok(items_returned == 1, "unexpected item count %u\n", items_returned); + + ok(schema.vt == VT_EMPTY, "%u: unexpected vt: %u\n", i, schema.vt); + ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); + ok(U(id).uiVal == td[i].id, "%u: unexpected id: %#x\n", i, U(id).uiVal); + ok(value.vt == td[i].type, "%u: unexpected vt: %u\n", i, value.vt); + ok(U(value).ulVal == td[i].value, "%u: unexpected id: %u\n", i, U(value).ulVal); + + PropVariantClear(&schema); + PropVariantClear(&id); + PropVariantClear(&value); + } + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_FALSE, "Next should fail\n"); + ok(items_returned == 0, "unexpected item count %u\n", items_returned); + + IWICEnumMetadataItem_Release(enumerator); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataFormat(reader, NULL); + ok(hr == E_INVALIDARG, "GetMetadataFormat should fail\n"); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + + hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, NULL, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, &schema, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(schema.vt == VT_EMPTY, "unexpected vt: %u\n", schema.vt); + + hr = IWICMetadataReader_GetValueByIndex(reader, count - 1, &schema, NULL, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(schema.vt == VT_EMPTY, "unexpected vt: %u\n", schema.vt); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &id, NULL); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(id.vt == VT_UI2, "unexpected vt: %u\n", id.vt); + ok(U(id).uiVal == 0xfe, "unexpected id: %#x\n", U(id).uiVal); + PropVariantClear(&id); + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); + ok(hr == S_OK, "GetValueByIndex error %#x\n", hr); + ok(value.vt == VT_UI2, "unexpected vt: %u\n", value.vt); + ok(U(value).ulVal == 1, "unexpected id: %u\n", U(value).ulVal); + PropVariantClear(&value); + + hr = IWICMetadataReader_GetValueByIndex(reader, count, &schema, NULL, NULL); + ok(hr == E_INVALIDARG, "GetValueByIndex should fail\n"); + + IWICMetadataReader_Release(reader); +} + static void test_create_reader(void) { HRESULT hr; @@ -338,6 +491,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); + test_metadata_IFD(); test_create_reader(); CoUninitialize();

1 0

Jacek Caban : wininet: Store security flags in server_t.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 59a0ab54cb18d4f21e2c6407fc6e9eb859f52f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a0ab54cb18d4f21e2c6407f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:34:43 2012 +0200 wininet: Store security flags in server_t. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 ++ dlls/wininet/netconnection.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d8b3d1c..1392fb8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -266,6 +266,7 @@ static server_t *get_server(const WCHAR *name, INTERNET_PORT port) server->addr_len = 0; server->ref = 1; server->port = port; + server->security_flags = 0; list_init(&server->conn_pool); server->name = heap_strdupW(name); if(server->name) { @@ -1997,10 +1998,9 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); - flags = 0; + flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; - flags |= req->security_flags; if(req->netconn) { int bits = NETCON_GetCipherStrength(req->netconn); if (bits >= 128) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 38d6275..bf11e6d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -63,6 +63,8 @@ typedef struct { LONG ref; DWORD64 keep_until; + DWORD security_flags; + struct list entry; struct list conn_pool; } server_t; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4d3e13f..f799dbd 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -511,7 +511,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, DWORD netconn->useSSL = useSSL; netconn->socketFD = -1; - netconn->security_flags = security_flags; + netconn->security_flags = security_flags | server->security_flags; list_init(&netconn->pool_entry); assert(server->addr_len); @@ -729,6 +729,7 @@ DWORD NETCON_secure_connect(netconn_t *connection) } connection->ssl_s = ssl_s; + connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; fail:

1 0

Henri Verbeet : d3d9: Add a separate function for d3d9 initialization.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 5b2d1710434aa71fc9bd421f1836db710b21bf9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2d1710434aa71fc9bd421f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 25 16:10:30 2012 +0200 d3d9: Add a separate function for d3d9 initialization. --- dlls/d3d9/d3d9_main.c | 58 +++++++++++++++++++++++++++------------------ dlls/d3d9/d3d9_private.h | 14 +---------- dlls/d3d9/directx.c | 18 ++++++++++++- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 6eed9b7..e3bb9f8 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -33,40 +33,52 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { - IDirect3D9Impl* object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3D9Impl)); - - object->IDirect3D9Ex_iface.lpVtbl = &Direct3D9_Vtbl; - object->ref = 1; +IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version) +{ + IDirect3D9Impl *object; - wined3d_mutex_lock(); - object->WineD3D = wined3d_create(9, 0); - wined3d_mutex_unlock(); + TRACE("sdk_version %#x.\n", sdk_version); - TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate d3d9 object memory.\n"); + return NULL; + } - if (!object->WineD3D) + if (!d3d9_init(object, FALSE)) { - HeapFree( GetProcessHeap(), 0, object ); - object = NULL; + WARN("Failed to initialize d3d9.\n"); + HeapFree(GetProcessHeap(), 0, object); + return NULL; } - return (IDirect3D9*) object; + + TRACE("Created d3d9 object %p.\n", object); + + return (IDirect3D9 *)&object->IDirect3D9Ex_iface; } -HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex **direct3d9ex) { - IDirect3D9 *ret; - IDirect3D9Impl* object; +HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9Ex **d3d9ex) +{ + IDirect3D9Impl *object; - TRACE("Calling Direct3DCreate9\n"); - ret = Direct3DCreate9(SDKVersion); - if(!ret) { - *direct3d9ex = NULL; + TRACE("sdk_version %#x, d3d9ex %p.\n", sdk_version, d3d9ex); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate d3d9 object memory.\n"); + return E_OUTOFMEMORY; + } + + if (!d3d9_init(object, TRUE)) + { + WARN("Failed to initialize d3d9.\n"); + HeapFree(GetProcessHeap(), 0, object); return D3DERR_NOTAVAILABLE; } - object = (IDirect3D9Impl *) ret; - object->extended = TRUE; /* Enables QI for extended interfaces */ - *direct3d9ex = &object->IDirect3D9Ex_iface; + TRACE("Created d3d9 object %p.\n", object); + *d3d9ex = &object->IDirect3D9Ex_iface; + return D3D_OK; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index d814dd0..793c948 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -127,19 +127,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->MaxVertexShader30InstructionSlots = _pWineCaps->MaxVertexShader30InstructionSlots; \ _pD3D9Caps->MaxPixelShader30InstructionSlots = _pWineCaps->MaxPixelShader30InstructionSlots; -/* =========================================================================== - D3D9 interfaces - =========================================================================== */ - -/* ---------- */ -/* IDirect3D9 */ -/* ---------- */ - -/***************************************************************************** - * Predeclare the interface implementation structures - */ -extern const IDirect3D9ExVtbl Direct3D9_Vtbl DECLSPEC_HIDDEN; - /***************************************************************************** * IDirect3D implementation structure */ @@ -155,6 +142,7 @@ typedef struct IDirect3D9Impl BOOL extended; } IDirect3D9Impl; +BOOL d3d9_init(IDirect3D9Impl *d3d9, BOOL extended) DECLSPEC_HIDDEN; void filter_caps(D3DCAPS9* pCaps) DECLSPEC_HIDDEN; struct fvf_declaration diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d8a5d78..80b862d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -551,8 +551,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT return hr; } - -const IDirect3D9ExVtbl Direct3D9_Vtbl = +static const struct IDirect3D9ExVtbl Direct3D9_Vtbl = { /* IUnknown */ IDirect3D9Impl_QueryInterface, @@ -581,3 +580,18 @@ const IDirect3D9ExVtbl Direct3D9_Vtbl = IDirect3D9ExImpl_GetAdapterLUID }; + +BOOL d3d9_init(IDirect3D9Impl *d3d9, BOOL extended) +{ + d3d9->IDirect3D9Ex_iface.lpVtbl = &Direct3D9_Vtbl; + d3d9->ref = 1; + + wined3d_mutex_lock(); + d3d9->WineD3D = wined3d_create(9, 0); + wined3d_mutex_unlock(); + if (!d3d9->WineD3D) + return FALSE; + d3d9->extended = extended; + + return TRUE; +}

1 0

Jacek Caban : wininet: Set SECURITY_FLAG_SECURRE in NETCON_secure_connect.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 90ec92dfd1cce496c9bbf78ff79c32253ccde529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ec92dfd1cce496c9bbf78ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 16:34:59 2012 +0200 wininet: Set SECURITY_FLAG_SECURRE in NETCON_secure_connect. --- dlls/wininet/http.c | 2 -- dlls/wininet/netconnection.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1392fb8..1943e91 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1999,8 +1999,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) - flags |= SECURITY_FLAG_SECURE; if(req->netconn) { int bits = NETCON_GetCipherStrength(req->netconn); if (bits >= 128) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f799dbd..ac9f347 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -729,6 +729,8 @@ DWORD NETCON_secure_connect(netconn_t *connection) } connection->ssl_s = ssl_s; + + connection->security_flags |= SECURITY_FLAG_SECURE; connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS;

1 0