December 2009 - Wine-commits

Aric Stewart : shlwapi: Rename ConnectToConnectionPoint bAdviseOnly to fConnect as MSDN.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 56d1a7c00357498b485dd79128ae38f906e56944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d1a7c00357498b485dd7912… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 10 13:15:58 2009 -0600 shlwapi: Rename ConnectToConnectionPoint bAdviseOnly to fConnect as MSDN. --- dlls/shlwapi/ordinal.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 0ecbab8..ba614d3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1128,7 +1128,7 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent) * PARAMS * lpUnkSink [I] Sink for the connection point advise call * riid [I] REFIID of connection point to advise - * bAdviseOnly [I] TRUE = Advise only, FALSE = Unadvise first + * fConnect [I] TRUE = Connection being establisted, FALSE = broken * lpUnknown [I] Object supporting the IConnectionPointContainer interface * lpCookie [O] Pointer to connection point cookie * lppCP [O] Destination for the IConnectionPoint found @@ -1140,7 +1140,7 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent) * E_NOINTERFACE, if lpUnknown isn't an IConnectionPointContainer, * Or an HRESULT error code if any call fails. */ -HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL bAdviseOnly, +HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL fConnect, IUnknown* lpUnknown, LPDWORD lpCookie, IConnectionPoint **lppCP) { @@ -1148,7 +1148,7 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL b IConnectionPointContainer* lpContainer; IConnectionPoint *lpCP; - if(!lpUnknown || (bAdviseOnly && !lpUnkSink)) + if(!lpUnknown || (fConnect && !lpUnkSink)) return E_FAIL; if(lppCP) @@ -1162,9 +1162,10 @@ HRESULT WINAPI ConnectToConnectionPoint(IUnknown* lpUnkSink, REFIID riid, BOOL b if (SUCCEEDED(hRet)) { - if(!bAdviseOnly) + if(!fConnect) hRet = IConnectionPoint_Unadvise(lpCP, *lpCookie); - hRet = IConnectionPoint_Advise(lpCP, lpUnkSink, lpCookie); + else + hRet = IConnectionPoint_Advise(lpCP, lpUnkSink, lpCookie); if (FAILED(hRet)) *lpCookie = 0;

1 0

Aric Stewart : shlwapi: Failure in IConnectionPoint_GetConnectionInterface does not prevent Invoking .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 3dbc0b066707e73c823a766f5ba5706dc29f9312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbc0b066707e73c823a766f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 10 13:16:06 2009 -0600 shlwapi: Failure in IConnectionPoint_GetConnectionInterface does not prevent Invoking. --- dlls/shlwapi/ordinal.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index ba614d3..0b9999e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2938,7 +2938,7 @@ static HRESULT SHLWAPI_InvokeByIID( while(IEnumConnections_Next(enumerator, 1, &rgcd, NULL)==S_OK) { IDispatch *dispIface; - if (SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, iid, (LPVOID*)&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); @@ -2966,6 +2966,8 @@ HRESULT WINAPI IConnectionPoint_InvokeWithCancel( IConnectionPoint* iCP, result = IConnectionPoint_GetConnectionInterface(iCP, &iid); if (SUCCEEDED(result)) result = SHLWAPI_InvokeByIID(iCP, &iid, dispId, dispParams); + else + result = SHLWAPI_InvokeByIID(iCP, NULL, dispId, dispParams); return result; } @@ -2989,6 +2991,8 @@ HRESULT WINAPI IConnectionPoint_SimpleInvoke( result = IConnectionPoint_GetConnectionInterface(iCP, &iid); if (SUCCEEDED(result)) result = SHLWAPI_InvokeByIID(iCP, &iid, dispId, dispParams); + else + result = SHLWAPI_InvokeByIID(iCP, NULL, dispId, dispParams); return result; }

1 0

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

11 Dec '09

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

Aric Stewart : shlwapi: Release rgcd.pUnk returned by enumeration.
by Alexandre Julliard 11 Dec '09

11 Dec '09

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/tests: Testing framework and IConnection point tests .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 23cea50db2ffed0fd6c1f0acdd950b7efe516335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cea50db2ffed0fd6c1f0acd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 10 13:16:34 2009 -0600 shlwapi/tests: Testing framework and IConnection point tests. --- dlls/shlwapi/tests/ordinal.c | 686 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 686 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23cea50db2ffed0fd6c1f…

1 0

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

11 Dec '09

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

Alexandre Julliard : dbghelp: Fix an invalid pointer cast.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 891d025639bbd5dcfe27364cceb6e858cb2db2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891d025639bbd5dcfe27364cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 15:31:27 2009 +0100 dbghelp: Fix an invalid pointer cast. --- dlls/dbghelp/dbghelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 1f9f0f8..b501425 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -524,7 +524,7 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) case CBA_DEFERRED_SYMBOL_LOAD_FAILURE: case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL: case CBA_DEFERRED_SYMBOL_LOAD_START: - idslW = (IMAGEHLP_DEFERRED_SYMBOL_LOADW64*)(DWORD)data; + idslW = data; idsl.SizeOfStruct = sizeof(idsl); idsl.BaseOfImage = idslW->BaseOfImage; idsl.CheckSum = idslW->CheckSum;

1 0

Maarten Lankhorst : dsound: Only initialize one guid for capture and renderer.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: b474649e0e9491f938f1daec74cdca01343dd97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b474649e0e9491f938f1daec7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 15:49:12 2009 +0100 dsound: Only initialize one guid for capture and renderer. --- dlls/dsound/capture.c | 11 ++---- dlls/dsound/dsound.c | 10 ++--- dlls/dsound/dsound_main.c | 76 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 5 +-- dlls/dsound/propset.c | 14 ++++--- 5 files changed, 56 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b474649e0e9491f938f1d…

1 0

Maarten Lankhorst : mmdevapi: Add initial mmdevapi dll.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: a9a3a8e15516ad982a6ed28cc72cc835b10aee15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a3a8e15516ad982a6ed28cc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 15:38:43 2009 +0100 mmdevapi: Add initial mmdevapi dll. --- configure | 9 ++ configure.ac | 1 + dlls/mmdevapi/Makefile.in | 14 ++++ dlls/mmdevapi/main.c | 59 ++++++++++++++ dlls/mmdevapi/mmdevapi.spec | 19 +++++ dlls/mmdevapi/regsvr.c | 181 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 7 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9a3a8e15516ad982a6ed…

1 0

Paul Vriens : comctl32/tests: Fix a test failure on older comctl32.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 1d0e02b63e3680ff38393e1e2af0c40ce8ff6d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0e02b63e3680ff38393e1e2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 10 16:23:31 2009 +0100 comctl32/tests: Fix a test failure on older comctl32. --- dlls/comctl32/tests/datetime.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index a871930..a97ab34 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -667,7 +667,8 @@ static void test_wm_set_get_text(void) ret = SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)a_str); ok(CB_ERR == ret || - broken(1 == ret), /* comctl32 <= 4.72 */ + broken(0 == ret) || /* comctl32 <= 4.72 */ + broken(1 == ret), /* comctl32 <= 4.70 */ "Expected CB_ERR, got %ld\n", ret); buff[0] = 0;

1 0