January 2011 - Wine-Commits

Michael Stefaniuc : explorerframe: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 4156a8045260bb2be8e7f2db91cabcf323e94a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4156a8045260bb2be8e7f2db9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 01:59:16 2011 +0100 explorerframe: COM cleanup for the IClassFactory iface. --- dlls/explorerframe/explorerframe_main.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 365898f..a62d885 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -101,22 +101,22 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) /************************************************************************* * Implement the ExplorerFrame class factory - * - * (Taken from shdocvw/factory.c; based on implementation in - * ddraw/main.c) */ -#define FACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) - typedef struct { - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*cf)(IUnknown*, REFIID, void**); LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + /************************************************************************* - * EFCF_QueryInterface (IUnknown) + * EFCF_QueryInterface */ static HRESULT WINAPI EFCF_QueryInterface(IClassFactory* iface, REFIID riid, void **ppobj) @@ -140,7 +140,7 @@ static HRESULT WINAPI EFCF_QueryInterface(IClassFactory* iface, } /************************************************************************* - * EFCF_AddRef (IUnknown) + * EFCF_AddRef */ static ULONG WINAPI EFCF_AddRef(IClassFactory *iface) { @@ -150,7 +150,7 @@ static ULONG WINAPI EFCF_AddRef(IClassFactory *iface) } /************************************************************************* - * EFCF_Release (IUnknown) + * EFCF_Release */ static ULONG WINAPI EFCF_Release(IClassFactory *iface) { @@ -165,7 +165,7 @@ static ULONG WINAPI EFCF_Release(IClassFactory *iface) static HRESULT WINAPI EFCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return This->cf(pOuter, riid, ppobj); } @@ -198,12 +198,12 @@ static const IClassFactoryVtbl EFCF_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - static IClassFactoryImpl NSTCClassFactory = {&EFCF_Vtbl, NamespaceTreeControl_Constructor}; + static IClassFactoryImpl NSTCClassFactory = {{&EFCF_Vtbl}, NamespaceTreeControl_Constructor}; TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(&CLSID_NamespaceTreeControl, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&NSTCClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&NSTCClassFactory.IClassFactory_iface, riid, ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Nikolay Sivov : oleaut32: Fix a stream leak on failure.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 92dbc57a7705b8e4b7d2e6d4e5176e59dd456d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92dbc57a7705b8e4b7d2e6d4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 00:38:16 2011 +0300 oleaut32: Fix a stream leak on failure. --- dlls/oleaut32/tmarshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9d3d73e..6536bb4 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -153,6 +153,7 @@ _unmarshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN *pUnk) { hres = IStream_Write(pStm,buf->base+buf->curoff,xsize,&res); if (hres) { ERR("stream write %x\n",hres); + IStream_Release(pStm); return hres; } @@ -160,12 +161,14 @@ _unmarshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN *pUnk) { hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); if (hres) { ERR("Failed Seek %x\n",hres); + IStream_Release(pStm); return hres; } hres = CoUnmarshalInterface(pStm,riid,(LPVOID*)pUnk); if (hres) { ERR("Unmarshalling interface %s failed with %x\n",debugstr_guid(riid),hres); + IStream_Release(pStm); return hres; }

1 0

Piotr Caban : mshtml: Added IObjectSafety stub.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 52a1065f706c6d5534b6b13b86f78001c7a92194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a1065f706c6d5534b6b13b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 19 21:31:43 2011 +0100 mshtml: Added IObjectSafety stub. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml.inf | 1 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/oleobj.c | 62 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 3 ++ 5 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 12e0947..2b05ab9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1827,6 +1827,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IOleContainer, riid)) { TRACE("(%p)->(IID_IOleContainer %p)\n", This, ppv); *ppv = &This->IOleContainer_iface; + }else if(IsEqualGUID(&IID_IObjectSafety, riid)) { + TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); + *ppv = &This->IObjectSafety_iface; }else { return FALSE; } diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index b06743a..279b16c 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -66,6 +66,7 @@ HKLM,"Software\Microsoft\Internet Explorer\AboutURLs","PostNotCached",2,"res://m HKLM,"Software\Microsoft\Internet Explorer\AboutURLs","mozilla",2,"res://mshtml.dll/about.moz" HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","VML",, "CLSID:10072CEC-8CC1-11D1-986E-00A0C955B42E" HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:476C391C-3E0D-11D2-B948-00C04FA32195" +HKLM,"Software\Microsoft\Internet Explorer\ActiveX Compatibility","Version",,"6.17" [WineGecko.Reg] diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 520061d..15348d5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -24,6 +24,7 @@ #include "hlink.h" #include "perhist.h" #include "dispex.h" +#include "objsafe.h" #include "wine/list.h" #include "wine/unicode.h" @@ -368,6 +369,7 @@ struct HTMLDocument { ISupportErrorInfo ISupportErrorInfo_iface; IObjectWithSite IObjectWithSite_iface; IOleContainer IOleContainer_iface; + IObjectSafety IObjectSafety_iface; IUnknown *unk_impl; IDispatchEx *dispex; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 98fbdef..f8a84ac 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -802,6 +802,10 @@ static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { ObjectWithSite_GetSite }; +/********************************************************** + * IOleContainer implementation + */ + static inline HTMLDocument *impl_from_IOleContainer(IOleContainer *iface) { return CONTAINING_RECORD(iface, HTMLDocument, IOleContainer_iface); @@ -856,6 +860,63 @@ static const IOleContainerVtbl OleContainerVtbl = { OleContainer_LockContainer }; +/********************************************************** + * IObjectSafety implementation + */ + +static inline HTMLDocument *impl_from_IObjectSafety(IObjectSafety *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IObjectSafety_iface); +} + +static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IObjectSafety(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI ObjectSafety_AddRef(IObjectSafety *iface) +{ + HTMLDocument *This = impl_from_IObjectSafety(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI ObjectSafety_Release(IObjectSafety *iface) +{ + HTMLDocument *This = impl_from_IObjectSafety(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI ObjectSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, + REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + HTMLDocument *This = impl_from_IObjectSafety(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, + REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + HTMLDocument *This = impl_from_IObjectSafety(iface); + FIXME("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + + if(IsEqualGUID(&IID_IPersistMoniker, riid) && + dwOptionSetMask==INTERFACESAFE_FOR_UNTRUSTED_DATA && + dwEnabledOptions==INTERFACESAFE_FOR_UNTRUSTED_DATA) + return S_OK; + + return E_NOTIMPL; +} + +static const IObjectSafetyVtbl ObjectSafetyVtbl = { + ObjectSafety_QueryInterface, + ObjectSafety_AddRef, + ObjectSafety_Release, + ObjectSafety_GetInterfaceSafetyOptions, + ObjectSafety_SetInterfaceSafetyOptions +}; + void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) { IOleContainer *container; @@ -879,4 +940,5 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->IObjectWithSite_iface.lpVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; + This->IObjectSafety_iface.lpVtbl = &ObjectSafetyVtbl; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6601d2d..f753b14 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -32,6 +32,7 @@ #include "docobj.h" #include "dispex.h" #include "mshtml_test.h" +#include "objsafe.h" static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; @@ -126,6 +127,7 @@ static const IID * const doc_node_iids[] = { &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, &IID_IOleContainer, + &IID_IObjectSafety, NULL }; @@ -139,6 +141,7 @@ static const IID * const doc_obj_iids[] = { &IID_IConnectionPointContainer, &IID_ICustomDoc, &IID_IOleContainer, + &IID_IObjectSafety, NULL };

1 0

Juan Lang : crypt32: Simplify a function.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: c3bc7f2cba431b80d2a0decaf48e341b120fc8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bc7f2cba431b80d2a0decaf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 19 12:08:28 2011 -0800 crypt32: Simplify a function. --- dlls/crypt32/str.c | 57 +++++++++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index e0e238b..9d814df 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -786,46 +786,41 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, if (value->end > value->start) { + LONG i; + LPWSTR ptr; + nameValue.Value.pbData = CryptMemAlloc((value->end - value->start) * sizeof(WCHAR)); if (!nameValue.Value.pbData) { SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; - } - } - if (ret) - { - if (value->end > value->start) - { - LONG i; - LPWSTR ptr = (LPWSTR)nameValue.Value.pbData; - - for (i = 0; i < value->end - value->start; i++) - { - *ptr++ = value->start[i]; - if (value->start[i] == '"') - i++; - } - nameValue.Value.cbData = (LPBYTE)ptr - nameValue.Value.pbData; + return FALSE; } - ret = CryptEncodeObjectEx(dwCertEncodingType, X509_UNICODE_NAME_VALUE, - &nameValue, CRYPT_ENCODE_ALLOC_FLAG, NULL, &output->pbData, - &output->cbData); - if (!ret && ppszError) + ptr = (LPWSTR)nameValue.Value.pbData; + for (i = 0; i < value->end - value->start; i++) { - if (type == CERT_RDN_NUMERIC_STRING && - GetLastError() == CRYPT_E_INVALID_NUMERIC_STRING) - *ppszError = value->start + output->cbData; - else if (type == CERT_RDN_PRINTABLE_STRING && - GetLastError() == CRYPT_E_INVALID_PRINTABLE_STRING) - *ppszError = value->start + output->cbData; - else if (type == CERT_RDN_IA5_STRING && - GetLastError() == CRYPT_E_INVALID_IA5_STRING) - *ppszError = value->start + output->cbData; + *ptr++ = value->start[i]; + if (value->start[i] == '"') + i++; } - CryptMemFree(nameValue.Value.pbData); + nameValue.Value.cbData = (LPBYTE)ptr - nameValue.Value.pbData; + } + ret = CryptEncodeObjectEx(dwCertEncodingType, X509_UNICODE_NAME_VALUE, + &nameValue, CRYPT_ENCODE_ALLOC_FLAG, NULL, &output->pbData, + &output->cbData); + if (!ret && ppszError) + { + if (type == CERT_RDN_NUMERIC_STRING && + GetLastError() == CRYPT_E_INVALID_NUMERIC_STRING) + *ppszError = value->start + output->cbData; + else if (type == CERT_RDN_PRINTABLE_STRING && + GetLastError() == CRYPT_E_INVALID_PRINTABLE_STRING) + *ppszError = value->start + output->cbData; + else if (type == CERT_RDN_IA5_STRING && + GetLastError() == CRYPT_E_INVALID_IA5_STRING) + *ppszError = value->start + output->cbData; } + CryptMemFree(nameValue.Value.pbData); return ret; }

1 0

Jacek Caban : wininet: Fixed race in SSL connection handling.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 59bcbb2d8b4225fed0211326662d29eb7cf56117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bcbb2d8b4225fed02113266… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 19 20:16:02 2011 +0100 wininet: Fixed race in SSL connection handling. --- dlls/wininet/netconnection.c | 56 +++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 958abfb..cfc4e7c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -368,7 +368,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { - connection->useSSL = FALSE; + connection->useSSL = useSSL; connection->socketFD = -1; if (useSSL) { @@ -544,10 +544,7 @@ void NETCON_unload(void) BOOL NETCON_connected(WININET_NETCONNECTION *connection) { - if (connection->socketFD == -1) - return FALSE; - else - return TRUE; + return connection->socketFD != -1; } /* translate a unix error code into a winsock one */ @@ -625,7 +622,7 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol) { #ifdef SONAME_LIBSSL - if (connection->useSSL) + if (connection->ssl_s) return ERROR_NOT_SUPPORTED; #endif @@ -647,13 +644,11 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) if (!NETCON_connected(connection)) return ERROR_SUCCESS; #ifdef SONAME_LIBSSL - if (connection->useSSL) + if (connection->ssl_s) { pSSL_shutdown(connection->ssl_s); pSSL_free(connection->ssl_s); connection->ssl_s = NULL; - - connection->useSSL = FALSE; } #endif @@ -671,26 +666,26 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) */ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) { + void *ssl_s; DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL /* can't connect if we are already connected */ - if (connection->useSSL) + if (connection->ssl_s) { ERR("already connected\n"); return ERROR_INTERNET_CANNOT_CONNECT; } - connection->ssl_s = pSSL_new(ctx); - if (!connection->ssl_s) + ssl_s = pSSL_new(ctx); + if (!ssl_s) { ERR("SSL_new failed: %s\n", pERR_error_string(pERR_get_error(), 0)); - res = ERROR_OUTOFMEMORY; - goto fail; + return ERROR_OUTOFMEMORY; } - if (!pSSL_set_fd(connection->ssl_s, connection->socketFD)) + if (!pSSL_set_fd(ssl_s, connection->socketFD)) { ERR("SSL_set_fd failed: %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -698,38 +693,37 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) goto fail; } - if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) + if (!pSSL_set_ex_data(ssl_s, hostname_idx, hostname)) { ERR("SSL_set_ex_data failed: %s\n", pERR_error_string(pERR_get_error(), 0)); res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } - if (!pSSL_set_ex_data(connection->ssl_s, conn_idx, connection)) + if (!pSSL_set_ex_data(ssl_s, conn_idx, connection)) { ERR("SSL_set_ex_data failed: %s\n", pERR_error_string(pERR_get_error(), 0)); res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } - if (pSSL_connect(connection->ssl_s) <= 0) + if (pSSL_connect(ssl_s) <= 0) { - res = (DWORD_PTR)pSSL_get_ex_data(connection->ssl_s, error_idx); + res = (DWORD_PTR)pSSL_get_ex_data(ssl_s, error_idx); if (!res) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; ERR("SSL_connect failed: %d\n", res); goto fail; } - connection->useSSL = TRUE; + connection->ssl_s = ssl_s; return ERROR_SUCCESS; fail: - if (connection->ssl_s) + if (ssl_s) { - pSSL_shutdown(connection->ssl_s); - pSSL_free(connection->ssl_s); - connection->ssl_s = NULL; + pSSL_shutdown(ssl_s); + pSSL_free(ssl_s); } #endif return res; @@ -776,6 +770,10 @@ DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len else { #ifdef SONAME_LIBSSL + if(!connection->ssl_s) { + FIXME("not connected\n"); + return ERROR_NOT_SUPPORTED; + } if (flags) FIXME("SSL_write doesn't support any flags (%08x)\n", flags); *sent = pSSL_write(connection->ssl_s, msg, len); @@ -810,6 +808,10 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int else { #ifdef SONAME_LIBSSL + if(!connection->ssl_s) { + FIXME("not connected\n"); + return ERROR_NOT_SUPPORTED; + } *recvd = pSSL_read(connection->ssl_s, buf, len); /* Check if EOF was received */ @@ -852,7 +854,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail else { #ifdef SONAME_LIBSSL - *available = pSSL_pending(connection->ssl_s); + *available = connection->ssl_s ? pSSL_pending(connection->ssl_s) : 0; #endif } return TRUE; @@ -864,7 +866,7 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) X509* cert; LPCVOID r = NULL; - if (!connection->useSSL) + if (!connection->ssl_s) return NULL; cert = pSSL_get_peer_certificate(connection->ssl_s); @@ -885,7 +887,7 @@ int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) #endif int bits = 0; - if (!connection->useSSL) + if (!connection->ssl_s) return 0; cipher = pSSL_get_current_cipher(connection->ssl_s); if (!cipher)

1 0

Henri Verbeet : wined3d: Store a pointer to an array of IWineD3DSwapChainImpl pointers in the device .
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 227efbbf652ead4a205e5a86c5cd5b917b161306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227efbbf652ead4a205e5a86c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 19 19:20:12 2011 +0100 wined3d: Store a pointer to an array of IWineD3DSwapChainImpl pointers in the device. --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 37 ++++++++++++++++++++++--------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a438a88..5ecd748 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1877,7 +1877,7 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur } else { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[0]; + IWineD3DSwapChainImpl *swapchain = This->swapchains[0]; if (swapchain->back_buffers) target = swapchain->back_buffers[0]; else target = swapchain->front_buffer; } @@ -1904,7 +1904,7 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur if (current_context && current_context->swapchain->device == This) context = current_context; else - context = swapchain_get_context((IWineD3DSwapChainImpl *)This->swapchains[0]); + context = swapchain_get_context(This->swapchains[0]); } context_validate(context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a099c90..d375ca3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1305,8 +1305,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, U IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : swapchain %d\n", This, iSwapChain); - if(iSwapChain < This->NumberOfSwapChains) { - *pSwapChain = This->swapchains[iSwapChain]; + if (iSwapChain < This->NumberOfSwapChains) + { + *pSwapChain = (IWineD3DSwapChain *)This->swapchains[iSwapChain]; IWineD3DSwapChain_AddRef(*pSwapChain); TRACE("(%p) returning %p\n", This, *pSwapChain); return WINED3D_OK; @@ -1939,12 +1940,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, } This->NumberOfSwapChains = 1; - This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(IWineD3DSwapChain *)); - if(!This->swapchains) { + This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(*This->swapchains)); + if (!This->swapchains) + { ERR("Out of memory!\n"); goto err_out; } - This->swapchains[0] = (IWineD3DSwapChain *) swapchain; + This->swapchains[0] = swapchain; if (swapchain->back_buffers && swapchain->back_buffers[0]) { @@ -2079,12 +2081,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_InitGDI(IWineD3DDevice *iface, } This->NumberOfSwapChains = 1; - This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(IWineD3DSwapChain *)); - if(!This->swapchains) { + This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(*This->swapchains)); + if (!This->swapchains) + { ERR("Out of memory!\n"); goto err_out; } - This->swapchains[0] = (IWineD3DSwapChain *) swapchain; + This->swapchains[0] = swapchain; return WINED3D_OK; err_out: @@ -2227,9 +2230,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, context_release(context); - for(i=0; i < This->NumberOfSwapChains; i++) { - TRACE("Releasing the implicit swapchain %d\n", i); - if (D3DCB_DestroySwapChain(This->swapchains[i]) > 0) { + for (i = 0; i < This->NumberOfSwapChains; ++i) + { + TRACE("Releasing the implicit swapchain %u.\n", i); + if (D3DCB_DestroySwapChain((IWineD3DSwapChain *)This->swapchains[i]) > 0) + { FIXME("(%p) Something's still holding the implicit swapchain\n", This); } } @@ -2255,9 +2260,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UninitGDI(IWineD3DDevice *iface, D3DCB_ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; unsigned int i; - for(i=0; i < This->NumberOfSwapChains; i++) { - TRACE("Releasing the implicit swapchain %d\n", i); - if (D3DCB_DestroySwapChain(This->swapchains[i]) > 0) { + for (i = 0; i < This->NumberOfSwapChains; ++i) + { + TRACE("Releasing the implicit swapchain %u.\n", i); + if (D3DCB_DestroySwapChain((IWineD3DSwapChain *)This->swapchains[i]) > 0) + { FIXME("(%p) Something's still holding the implicit swapchain\n", This); } } @@ -5820,7 +5827,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * if (This->depth_stencil) { - if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL + if (This->swapchains[0]->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || This->depth_stencil->flags & SFLAG_DISCARD) { surface_modify_ds_location(This->depth_stencil, SFLAG_DS_DISCARDED, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7e19a02..cce1a2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2014,7 +2014,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHD } else { IWineD3DSurfaceImpl *dds_primary; IWineD3DSwapChainImpl *swapchain; - swapchain = (IWineD3DSwapChainImpl *)This->resource.device->swapchains[0]; + swapchain = This->resource.device->swapchains[0]; dds_primary = swapchain->front_buffer; if (dds_primary && dds_primary->palette) pal = dds_primary->palette->palents; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 013ff2c..d7a6f4a 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -266,7 +266,7 @@ static HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHD } else { IWineD3DSurfaceImpl *dds_primary; IWineD3DSwapChainImpl *swapchain; - swapchain = (IWineD3DSwapChainImpl *)This->resource.device->swapchains[0]; + swapchain = This->resource.device->swapchains[0]; dds_primary = swapchain->front_buffer; if (dds_primary && dds_primary->palette) pal = dds_primary->palette->palents; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 819a6ab..baf009f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1707,7 +1707,7 @@ struct IWineD3DDeviceImpl WINED3DDEVTYPE devType; HWND focus_window; - IWineD3DSwapChain **swapchains; + IWineD3DSwapChainImpl **swapchains; UINT NumberOfSwapChains; struct list resources; /* a linked list to track resources created by the device */

1 0

Henri Verbeet : wined3d: Move swapchain context retrieval to swapchain.c.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 6f95f05aaf31e06267446a9aa8b9ae81c35c8460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f95f05aaf31e06267446a9aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 19 19:20:11 2011 +0100 wined3d: Move swapchain context retrieval to swapchain.c. --- dlls/wined3d/context.c | 39 ++++----------------------------------- dlls/wined3d/swapchain.c | 17 ++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 21 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2265188..a438a88 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1859,32 +1859,10 @@ static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *conte This->frag_pipe->enable_extension(FALSE); } -/***************************************************************************** - * findThreadContextForSwapChain - * - * Searches a swapchain for all contexts and picks one for the thread tid. - * If none can be found the swapchain is requested to create a new context - * - *****************************************************************************/ -static struct wined3d_context *findThreadContextForSwapChain(struct IWineD3DSwapChainImpl *swapchain, DWORD tid) -{ - unsigned int i; - - for (i = 0; i < swapchain->num_contexts; ++i) - { - if (swapchain->context[i]->tid == tid) - return swapchain->context[i]; - } - - /* Create a new context for the thread */ - return swapchain_create_context_for_thread(swapchain); -} - /* Do not call while under the GL lock. */ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target) { struct wined3d_context *current_context = context_get_current(); - DWORD tid = GetCurrentThreadId(); struct wined3d_context *context; if (current_context && current_context->destroyed) current_context = NULL; @@ -1915,27 +1893,18 @@ static struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWineD3DSur { TRACE("Rendering onscreen\n"); - context = findThreadContextForSwapChain(target->container.u.swapchain, tid); + context = swapchain_get_context(target->container.u.swapchain); } else { TRACE("Rendering offscreen\n"); - /* Stay with the currently active context. */ + /* Stay with the current context if possible. Otherwise use the + * context for the primary swapchain. */ if (current_context && current_context->swapchain->device == This) - { context = current_context; - } else - { - /* This may happen if the app jumps straight into offscreen rendering - * Start using the context of the primary swapchain. tid == 0 is no problem - * for findThreadContextForSwapChain. - * - * Can also happen on thread switches - in that case findThreadContextForSwapChain - * is perfect to call. */ - context = findThreadContextForSwapChain((IWineD3DSwapChainImpl *)This->swapchains[0], tid); - } + context = swapchain_get_context((IWineD3DSwapChainImpl *)This->swapchains[0]); } context_validate(context); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 430c751..f613dfe 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -783,7 +783,7 @@ err: } /* Do not call while under the GL lock. */ -struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChainImpl *swapchain) +static struct wined3d_context *swapchain_create_context(struct IWineD3DSwapChainImpl *swapchain) { struct wined3d_context **newArray; struct wined3d_context *ctx; @@ -813,6 +813,21 @@ struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChainImp return ctx; } +struct wined3d_context *swapchain_get_context(struct IWineD3DSwapChainImpl *swapchain) +{ + DWORD tid = GetCurrentThreadId(); + unsigned int i; + + for (i = 0; i < swapchain->num_contexts; ++i) + { + if (swapchain->context[i]->tid == tid) + return swapchain->context[i]; + } + + /* Create a new context for the thread */ + return swapchain_create_context(swapchain); +} + void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, UINT *height) { /* The drawable size of an onscreen drawable is the surface size. diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ea5067..819a6ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2634,7 +2634,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, WINED3DGAMMARAMP *pRamp) DECLSPEC_HIDDEN; -struct wined3d_context *swapchain_create_context_for_thread(struct IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN; +struct wined3d_context *swapchain_get_context(struct IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN; HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, void *parent) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Initialize the AutoRestoreDisplayMode field of WINED3DPRESENT_PARAMETERS ( Valgrind).
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 93f1c49ea40e75fd079b05a949c60f9ba85fee94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f1c49ea40e75fd079b05a94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 19 19:20:09 2011 +0100 ddraw: Initialize the AutoRestoreDisplayMode field of WINED3DPRESENT_PARAMETERS (Valgrind). --- dlls/ddraw/ddraw.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 06705fb..6aa3af6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2905,6 +2905,7 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac localParameters.Flags = 0; localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; localParameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; + localParameters.AutoRestoreDisplayMode = FALSE; /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ @@ -2959,6 +2960,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur presentation_parameters.Flags = 0; presentation_parameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; presentation_parameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; + presentation_parameters.AutoRestoreDisplayMode = FALSE; ddraw->d3d_target = primary; hr = IWineD3DDevice_InitGDI(ddraw->wineD3DDevice, &presentation_parameters);

1 0

Eric Pouech : kernel32: Fix prototype when no curses dev package is present .
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: f3fe497b4f300191d548b5121d85b436293e7e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3fe497b4f300191d548b5121… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Jan 19 22:34:35 2011 +0100 kernel32: Fix prototype when no curses dev package is present. --- dlls/kernel32/term.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 8111f0b..a7e18ec 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -365,5 +365,5 @@ int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) #else BOOL TERM_Init(void) {return FALSE;} BOOL TERM_Exit(void) {return FALSE;} -int TERM_FillInputRecord(const char* in, INPUT_RECORD* ir) {return -1;} +int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) {return -1;} #endif

1 0

Alexandre Julliard : hhctrl: Don't use an extended menu.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: d38571a67a7ba200f84ef79be48f8ebcd772e6ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38571a67a7ba200f84ef79be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 23:45:34 2011 +0100 hhctrl: Don't use an extended menu. --- dlls/hhctrl.ocx/help.c | 4 +++- dlls/hhctrl.ocx/hhctrl.rc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index d8725b1..4a0f78b 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -685,7 +685,9 @@ static void DisplayPopupMenu(HHInfo *info) /* Update the Show/Hide menu item */ item.cbSize = sizeof(MENUITEMINFOW); - item.fMask = MIIM_STRING; + item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING; + item.fType = MFT_STRING; + item.fState = MF_ENABLED; if (info->WinType.fNotExpanded) item.dwTypeData = HH_LoadString(IDS_SHOWTABS); diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 562a96b..89ba97f 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -62,7 +62,7 @@ BEGIN IDTB_TOC_PREV "IDTB_TOC_PREV" END -MENU_POPUP MENUEX +MENU_POPUP MENU { POPUP "Options" {

1 0