June 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw1 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 420f2329abfdd09682848108a9e46ce461bb5fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420f2329abfdd09682848108a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:22:29 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw1 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 149 ++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=420f2329abfdd09682848…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw2 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: bfe3475d5a42129bf3b77234ffb4ad744310d924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe3475d5a42129bf3b77234f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:24:47 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw2 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfe3475d5a42129bf3b77…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw4 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 7d74583e8ae420daaa73bf664763bbb0deea9009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d74583e8ae420daaa73bf664… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:35:25 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw4 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d74583e8ae420daaa73b…

1 0

Michael Stefaniuc : ddraw/tests: Use wine_dbgstr_rect() in the ddraw7 tests.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: a602e2f69aec83598824ae92cdebd48523203a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a602e2f69aec83598824ae92c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 8 22:37:13 2016 +0200 ddraw/tests: Use wine_dbgstr_rect() in the ddraw7 tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 164 ++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a602e2f69aec83598824a…

1 0

Aaryaman Vasishta : d3drm/tests: Fix some missing HRESULT returns in test_frame_qi.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 431f613beb2cf5590c6d3706d5e50fea2fe876b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=431f613beb2cf5590c6d3706d… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jun 9 03:37:29 2016 +0530 d3drm/tests: Fix some missing HRESULT returns in test_frame_qi. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f279314..5cd6a11 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2566,7 +2566,7 @@ static void test_frame_qi(void) hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame1); ok(hr == D3DRM_OK, "Failed to create frame1 (hr = %x)\n", hr); - IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr); IDirect3DRMFrame_Release(frame1); test_qi("frame1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); @@ -2576,7 +2576,7 @@ static void test_frame_qi(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); hr = IDirect3DRM2_CreateFrame(d3drm2, NULL, &frame2); ok(hr == D3DRM_OK, "Failed to create frame2 (hr = %x)\n", hr); - IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr); IDirect3DRMFrame2_Release(frame2); test_qi("frame2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); @@ -2586,7 +2586,7 @@ static void test_frame_qi(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); hr = IDirect3DRM3_CreateFrame(d3drm3, NULL, &frame3); ok(hr == D3DRM_OK, "Failed to create frame3 (hr = %x)\n", hr); - IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr); IDirect3DRMFrame3_Release(frame3); test_qi("frame3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests));

1 0

Nikolay Sivov : msscript: Added IPersistStreamInit stub.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 859d880b669a103242eeee06d6a3e6e34ccae545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859d880b669a103242eeee06d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 07:47:26 2016 +0300 msscript: Added IPersistStreamInit stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 98 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 14 ++++++ 2 files changed, 112 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a53266c..d525b57 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -21,6 +21,7 @@ #include "windows.h" #include "initguid.h" #include "ole2.h" +#include "olectl.h" #include "rpcproxy.h" #include "msscript.h" @@ -30,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); struct ScriptControl { IScriptControl IScriptControl_iface; + IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; LONG ref; IOleClientSite *site; @@ -126,6 +128,11 @@ static inline ScriptControl *impl_from_IOleObject(IOleObject *iface) return CONTAINING_RECORD(iface, ScriptControl, IOleObject_iface); } +static inline ScriptControl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IPersistStreamInit_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -142,6 +149,12 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IOleObject, riid)) { TRACE("(%p)->(IID_IOleObject %p\n", This, ppv); *ppv = &This->IOleObject_iface; + }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { + TRACE("(%p)->(IID_IPersistStreamInit %p\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(&IID_IPersist, riid)) { + TRACE("(%p)->(IID_IPersist %p\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -675,6 +688,90 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *clsid) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, clsid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream *stream, BOOL clear_dirty) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p %d)\n", This, stream, clear_dirty); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, ULARGE_INTEGER *size) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + ScriptControl *This = impl_from_IPersistStreamInit(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -687,6 +784,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow return E_OUTOFMEMORY; script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; + script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index ab1c3c1..7c96f99 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -21,6 +21,7 @@ #include <initguid.h> #include <ole2.h> +#include <olectl.h> #include "msscript.h" #include "wine/test.h" @@ -133,6 +134,18 @@ static void test_oleobject(void) IOleObject_Release(obj); } +static void test_persiststreaminit(void) +{ + IPersistStreamInit *init; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPersistStreamInit_Release(init); +} + START_TEST(msscript) { IUnknown *unk; @@ -149,6 +162,7 @@ START_TEST(msscript) IUnknown_Release(unk); test_oleobject(); + test_persiststreaminit(); CoUninitialize(); }

1 0

Nikolay Sivov : msscript: Implement GetExtent().
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 03b06fb76ba4204df5c20fda8955da09e16ec095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b06fb76ba4204df5c20fda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 8 07:47:27 2016 +0300 msscript: Implement GetExtent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/Makefile.in | 2 +- dlls/msscript.ocx/msscript.c | 19 +++++++++++++++++-- dlls/msscript.ocx/tests/Makefile.in | 2 +- dlls/msscript.ocx/tests/msscript.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index bc12e76..7d76896 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,7 +1,7 @@ MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl -IMPORTS = ole32 oleaut32 +IMPORTS = gdi32 user32 ole32 oleaut32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index d525b57..efa20c0 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -35,6 +35,7 @@ struct ScriptControl { IOleObject IOleObject_iface; LONG ref; IOleClientSite *site; + SIZEL extent; }; static HINSTANCE msscript_instance; @@ -611,9 +612,13 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL { ScriptControl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, aspect, size); + TRACE("(%p)->(%d %p)\n", This, aspect, size); - return E_NOTIMPL; + if (aspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + *size = This->extent; + return S_OK; } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD *connection) @@ -775,7 +780,9 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; + DWORD dpi_x, dpi_y; HRESULT hres; + HDC hdc; TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); @@ -789,6 +796,14 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->ref = 1; script_control->site = NULL; + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + script_control->extent.cx = MulDiv(38, 2540, dpi_x); + script_control->extent.cy = MulDiv(38, 2540, dpi_y); + hres = IScriptControl_QueryInterface(&script_control->IScriptControl_iface, riid, ppv); IScriptControl_Release(&script_control->IScriptControl_iface); return hres; diff --git a/dlls/msscript.ocx/tests/Makefile.in b/dlls/msscript.ocx/tests/Makefile.in index 597214a..8d769d3 100644 --- a/dlls/msscript.ocx/tests/Makefile.in +++ b/dlls/msscript.ocx/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msscript.ocx -IMPORTS = ole32 +IMPORTS = user32 gdi32 ole32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7c96f99..6dd7d67 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -96,10 +96,12 @@ static IOleClientSite testclientsite = { &OleClientSiteVtbl }; static void test_oleobject(void) { + DWORD status, dpi_x, dpi_y; IOleClientSite *site; IOleObject *obj; - DWORD status; + SIZEL extent; HRESULT hr; + HDC hdc; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&obj); @@ -131,6 +133,36 @@ static void test_oleobject(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(site == NULL, "got %p\n", site); + /* extents */ + hdc = GetDC(0); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + memset(&extent, 0, sizeof(extent)); + hr = IOleObject_GetExtent(obj, DVASPECT_CONTENT, &extent); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(extent.cx == MulDiv(38, 2540, dpi_x), "got %d\n", extent.cx); + ok(extent.cy == MulDiv(38, 2540, dpi_y), "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_THUMBNAIL, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_ICON, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + + extent.cx = extent.cy = 0xdeadbeef; + hr = IOleObject_GetExtent(obj, DVASPECT_DOCPRINT, &extent); + ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + IOleObject_Release(obj); }

1 0

Jacek Caban : user32: Make SetWindowLongW hotpatchable.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: bce9e1d2bd82531476a6c0ea96ef6a1913ebbd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce9e1d2bd82531476a6c0ea9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 19:59:33 2016 +0200 user32: Make SetWindowLongW hotpatchable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index eb1aeda..463602a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2678,7 +2678,7 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * and WM_STYLECHANGED afterwards. * App ver 4.0 can't use SetWindowLong to change WS_EX_TOPMOST. */ -LONG WINAPI SetWindowLongW( +LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( HWND hwnd, /* [in] window to alter */ INT offset, /* [in] offset, in bytes, of location to alter */ LONG newval /* [in] new value of location */

1 0

Béla Gyebrószki : quartz: Fix a typo in an ERR() message.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 9c8566654d324100d37f609bafda4cae61ea38e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8566654d324100d37f609ba… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Wed Jun 8 20:59:15 2016 +0200 quartz: Fix a typo in an ERR() message. Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d6c4617..677cc1c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1045,7 +1045,7 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, } else { - ERR("pInputPin Disconncted\n"); + ERR("pInputPin Disconnected\n"); hr = E_FAIL; } LeaveCriticalSection(&This->renderer.filter.csFilter);

1 0

Alexandre Julliard : ntdll: Add a helper function for registering a file read async I/O.
by Alexandre Julliard 09 Jun '16

09 Jun '16

Module: wine Branch: master Commit: 7a8ebc828e763284fdda027dcdf135cc01a58dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8ebc828e763284fdda027dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 15:31:00 2016 +0900 ntdll: Add a helper function for registering a file read async I/O. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 66 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 55bdac0..7d09c8f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -774,6 +774,42 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL return status; } +/* register an async I/O for a file read; helper for NtReadFile */ +static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *iosb, void *buffer, + ULONG already, ULONG length, BOOL avail_mode ) +{ + ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; + struct async_fileio_read *fileio; + NTSTATUS status; + + if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), handle, apc, apc_user ))) + return STATUS_NO_MEMORY; + + fileio->already = already; + fileio->count = length; + fileio->buffer = buffer; + fileio->avail_mode = avail_mode; + + SERVER_START_REQ( register_async ) + { + req->type = ASYNC_TYPE_READ; + req->count = length; + req->async.handle = wine_server_obj_handle( handle ); + req->async.event = wine_server_obj_handle( event ); + req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); + req->async.iosb = wine_server_client_ptr( iosb ); + req->async.arg = wine_server_client_ptr( fileio ); + req->async.cvalue = cvalue; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + return status; +} + /****************************************************************************** * NtReadFile [NTDLL.@] @@ -910,7 +946,6 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (async_read) { - struct async_fileio_read *fileio; BOOL avail_mode; if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) @@ -920,33 +955,8 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, status = STATUS_SUCCESS; goto done; } - - fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); - if (!fileio) - { - status = STATUS_NO_MEMORY; - goto err; - } - fileio->already = total; - fileio->count = length; - fileio->buffer = buffer; - fileio->avail_mode = avail_mode; - - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->count = length; - req->async.handle = wine_server_obj_handle( hFile ); - req->async.event = wine_server_obj_handle( hEvent ); - req->async.callback = wine_server_client_ptr( FILE_AsyncReadService ); - req->async.iosb = wine_server_client_ptr( io_status ); - req->async.arg = wine_server_client_ptr( fileio ); - req->async.cvalue = cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; - - if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, fileio ); + status = register_async_file_read( hFile, hEvent, apc, apc_user, io_status, + buffer, total, length, avail_mode ); goto err; } else /* synchronous read, wait for the fd to become ready */

1 0