December 2009 - Wine-Commits

Vincent Povirk : ole32: Add a stub transacted storage type.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: d799f7e18962669c445aebdf06dac3befa888e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799f7e18962669c445aebdf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 10:59:47 2009 -0600 ole32: Add a stub transacted storage type. TransactedSnapshotImpl acts as a proxy between the user and the storage interfaces that modify the file directly (or another transacted storage). Currently, it does not change the operations. --- dlls/ole32/storage32.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ole32/storage32.h | 5 + 2 files changed, 271 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d799f7e18962669c445ae…

1 0

Henri Verbeet : wined3d: Correctly calculate the extended style in IWineD3DDeviceImpl_RestoreWindow ().
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 75ef50e4354e764bf9b7ab6bcd8eccfe4354f4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ef50e4354e764bf9b7ab6bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 21:41:53 2009 +0100 wined3d: Correctly calculate the extended style in IWineD3DDeviceImpl_RestoreWindow(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c04f32b..029884c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1014,8 +1014,8 @@ static void IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) * Some applications change it before calling Reset() when switching between windowed and * fullscreen modes(HL2), some depend on the original style(Eve Online) */ - if(style == fullscreen_style(This->style) && - exStyle == fullscreen_style(This->exStyle)) { + if (style == fullscreen_style(This->style) && exStyle == fullscreen_exStyle(This->exStyle)) + { SetWindowLongW(window, GWL_STYLE, This->style); SetWindowLongW(window, GWL_EXSTYLE, This->exStyle); }

1 0

Vincent Povirk : ole32: Implement transacted storage.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 226363f5dfb9caa8313e425c7f85ed9fe581f1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=226363f5dfb9caa8313e425c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 17:33:50 2009 -0600 ole32: Implement transacted storage. --- dlls/ole32/storage32.c | 214 +++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/storage32.c | 8 +- 2 files changed, 201 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=226363f5dfb9caa8313e4…

1 0

Vincent Povirk : ole32: Create internal storage objects with a refcount of 1.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 75fe621192c07de5e54fee3e566c3f798e9f1d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe621192c07de5e54fee3e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 11:03:36 2009 -0600 ole32: Create internal storage objects with a refcount of 1. For consistency with StorageImpl_Construct. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index eaddcbf..f9f8e87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -595,8 +595,6 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( { *ppstg = (IStorage*)newStorage; - StorageBaseImpl_AddRef(*ppstg); - list_add_tail(&This->storageHead, &newStorage->ParentListEntry); res = S_OK; @@ -4382,6 +4380,8 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.reverted = 0; + newStorage->base.ref = 1; + newStorage->parentStorage = parentStorage; /*

1 0

Henri Verbeet : wined3d: Properly invalidate the context' s draw buffer in color_fill_fbo().
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 840b5af77e7e387d32b24a6f7d48f0a0e8d32ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=840b5af77e7e387d32b24a6f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 21:41:52 2009 +0100 wined3d: Properly invalidate the context's draw buffer in color_fill_fbo(). --- dlls/wined3d/context.c | 8 ++++++++ dlls/wined3d/device.c | 13 ++++++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8a2a522..0debd2e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2097,6 +2097,14 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit } } +/* GL locking is done by the caller. */ +void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) +{ + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer()"); + context->draw_buffer_dirty = TRUE; +} + /***************************************************************************** * context_acquire * diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a4eacba..c04f32b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5696,18 +5696,17 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, IWineD3DSwapChain *swapchain; swapchain = get_swapchain(surface); - if (!surface_is_offscreen(surface)) { - GLenum buffer; - + if (!surface_is_offscreen(surface)) + { TRACE("Surface %p is onscreen\n", surface); context = context_acquire(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - buffer = surface_get_gl_buffer(surface, swapchain); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer()"); - } else { + context_set_draw_buffer(context, surface_get_gl_buffer(surface, swapchain)); + } + else + { TRACE("Surface %p is offscreen\n", surface); context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35887f7..9cecc97 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1187,6 +1187,7 @@ struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; +void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain) DECLSPEC_HIDDEN;

1 0

Juan Lang : crypt32: Fix CertAddCTLContextToStore for CERT_STORE_ADD_USE_EXISTING add disposition .
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 7a610a907241f37e3df21edf0396492eb8d42946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a610a907241f37e3df21edf0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 10 09:06:39 2009 -0800 crypt32: Fix CertAddCTLContextToStore for CERT_STORE_ADD_USE_EXISTING add disposition. --- dlls/crypt32/ctl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 44b517a..40895fa 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -113,7 +113,13 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, break; case CERT_STORE_ADD_USE_EXISTING: if (existing) + { CtlContext_CopyProperties(existing, pCtlContext); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCTLContext(existing); + } + else + toAdd = CertDuplicateCTLContext(pCtlContext); break; default: FIXME("Unimplemented add disposition %d\n", dwAddDisposition);

1 0

Aric Stewart : shlwapi: Release rgcd.pUnk returned by enumeration.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: deef2c5ac26a6bfb70b8a4b9f241d6a7f86accba URL: http://source.winehq.org/git/wine.git/?a=commit;h=deef2c5ac26a6bfb70b8a4b9f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 10 13:16:26 2009 -0600 shlwapi: Release rgcd.pUnk returned by enumeration. --- dlls/shlwapi/ordinal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 6b0a9bc..73d0f7e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2950,6 +2950,7 @@ static HRESULT SHLWAPI_InvokeByIID( IDispatch_Invoke(dispIface, dispId, &IID_NULL, 0, DISPATCH_METHOD, params, NULL, NULL, NULL); IDispatch_Release(dispIface); } + IUnknown_Release(rgcd.pUnk); } IEnumConnections_Release(enumerator);

1 0

Aric Stewart : shlwapi: DISPPARAMS on Invoke are never NULL.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: ec2a78c30a8e91fae0ba49f0066f8cde526033be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec2a78c30a8e91fae0ba49f00… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 10 13:16:14 2009 -0600 shlwapi: DISPPARAMS on Invoke are never NULL. --- dlls/shlwapi/ordinal.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 0b9999e..6b0a9bc 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2930,18 +2930,24 @@ static HRESULT SHLWAPI_InvokeByIID( { IEnumConnections *enumerator; CONNECTDATA rgcd; + static DISPPARAMS empty = {NULL, NULL, 0, 0}; + DISPPARAMS* params = dispParams; HRESULT result = IConnectionPoint_EnumConnections(iCP, &enumerator); if (FAILED(result)) return result; + /* Invoke is never happening with an NULL dispParams */ + if (!params) + params = ∅ + while(IEnumConnections_Next(enumerator, 1, &rgcd, NULL)==S_OK) { IDispatch *dispIface; if ((iid && SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, iid, (LPVOID*)&dispIface))) || SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, &IID_IDispatch, (LPVOID*)&dispIface))) { - IDispatch_Invoke(dispIface, dispId, &IID_NULL, 0, DISPATCH_METHOD, dispParams, NULL, NULL, NULL); + IDispatch_Invoke(dispIface, dispId, &IID_NULL, 0, DISPATCH_METHOD, params, NULL, NULL, NULL); IDispatch_Release(dispIface); } }

1 0

Juan Lang : crypt32: Don't dereference an output pointer which may be NULL.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 0444cd93c42a61c66074007720e6280b0221c229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0444cd93c42a61c6607400772… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 10 08:58:20 2009 -0800 crypt32: Don't dereference an output pointer which may be NULL. --- dlls/crypt32/store.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 3a786b0..9d670f9 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -899,7 +899,8 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, if (existing) { CertContext_CopyProperties(existing, pCertContext); - *ppStoreContext = CertDuplicateCertificateContext(existing); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(existing); } else toAdd = CertDuplicateCertificateContext(pCertContext);

1 0

Vincent Povirk : wineboot: Do not force --kill when --end-session is set.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: decf64b86c437303f2cec6a3a4b009d2f9448974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=decf64b86c437303f2cec6a3a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 10 12:19:49 2009 -0600 wineboot: Do not force --kill when --end-session is set. The --kill switch ends processes from all desktops, but --end-session only applies to the current desktop. This causes windows from other desktops to dangerously close without notification that the session is ending. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 2587ef5..60a51b7 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -956,7 +956,7 @@ int main( int argc, char *argv[] ) { switch(optc) { - case 'e': end_session = kill = 1; break; + case 'e': end_session = 1; break; case 'f': force = 1; break; case 'i': init = 1; break; case 'k': kill = 1; break;

1 0