March 2020 - Wine-Commits - list.winehq.org

Jefferson Carpenter : user32: Always initialize module in load_desktop_driver.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: bc9d4eb55adc2b9063aa9807138b36eff43a96d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc9d4eb55adc2b9063aa9807… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Thu Mar 12 07:48:14 2020 +0000 user32: Always initialize module in load_desktop_driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48742 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 8f3e1b3597..6d916c7d65 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -85,6 +85,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) else { size = sizeof(driver_load_error); + *module = NULL; RegQueryValueExA( hkey, "DriverError", NULL, NULL, (BYTE *)driver_load_error, &size ); } RegCloseKey( hkey );

1 0

Zebediah Figura : quartz: Unregister the video window class on DLL unload.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 2db87b733f92f8541de6ba4dafefb8f05eb9aae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db87b733f92f8541de6ba4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:13 2020 -0500 quartz: Unregister the video window class on DLL unload. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48734 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 7 ++++--- dlls/quartz/quartz_private.h | 1 + dlls/quartz/window.c | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 9c61dd50d7..284f2cacae 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,10 +29,11 @@ extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; static LONG server_locks = 0; -/* For the moment, do nothing here. */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - return QUARTZ_DllMain( hInstDLL, fdwReason, lpv ); + if (reason == DLL_PROCESS_DETACH) + video_window_unregister_class(); + return QUARTZ_DllMain(instance, reason, reserved); } static HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 2b100969eb..3332c27d21 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -123,6 +123,7 @@ typedef struct tagBaseControlWindow HRESULT video_window_init(BaseControlWindow *window, const IVideoWindowVtbl *vtbl, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseWindowFuncTable *func_table) DECLSPEC_HIDDEN; +void video_window_unregister_class(void) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow) DECLSPEC_HIDDEN; BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 6e1a60086f..0b0df136f2 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -741,3 +741,9 @@ HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *C return S_OK; } + +void video_window_unregister_class(void) +{ + if (!UnregisterClassW(class_name, NULL) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + ERR("Failed to unregister class, error %u.\n", GetLastError()); +}

1 0

Zebediah Figura : strmbase: Move video.c to quartz.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: f55427fb9da28f99593f978f0bbd2b9c41143bd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55427fb9da28f99593f978f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:12 2020 -0500 strmbase: Move video.c to quartz. The only filters that expose IBasicVideo live in quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 + dlls/quartz/quartz_private.h | 39 +++++++++++++++++++++++++++++++++++ dlls/{strmbase => quartz}/video.c | 8 ++++---- dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/strmbase/Makefile.in | 3 +-- include/wine/strmbase.h | 43 --------------------------------------- 7 files changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 4ba8edf5fe..858b957879 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ memallocator.c \ regsvr.c \ systemclock.c \ + video.c \ videorenderer.c \ vmr9.c \ window.c diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index cbf5da4c09..2b100969eb 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -174,4 +174,43 @@ HRESULT WINAPI BaseControlWindowImpl_GetRestorePosition(IVideoWindow *iface, LON HRESULT WINAPI BaseControlWindowImpl_HideCursor(IVideoWindow *iface, LONG HideCursor) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *CursorHidden) DECLSPEC_HIDDEN; +typedef struct tagBaseControlVideo +{ + IBasicVideo IBasicVideo_iface; + + struct strmbase_filter *pFilter; + struct strmbase_pin *pPin; + + const struct BaseControlVideoFuncTable *pFuncsTable; +} BaseControlVideo; + +typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); +typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); +typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); +typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This); +typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); +typedef HRESULT (WINAPI *BaseControlVideo_SetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); + +typedef struct BaseControlVideoFuncTable +{ + BaseControlVideo_GetSourceRect pfnGetSourceRect; + BaseControlVideo_GetStaticImage pfnGetStaticImage; + BaseControlVideo_GetTargetRect pfnGetTargetRect; + BaseControlVideo_GetVideoFormat pfnGetVideoFormat; + BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; + BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; + BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; + BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect; + BaseControlVideo_SetSourceRect pfnSetSourceRect; + BaseControlVideo_SetTargetRect pfnSetTargetRect; +} BaseControlVideoFuncTable; + +HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN; +HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN; + #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/strmbase/video.c b/dlls/quartz/video.c similarity index 98% rename from dlls/strmbase/video.c rename to dlls/quartz/video.c index 081794e9b3..f59c2dee0c 100644 --- a/dlls/strmbase/video.c +++ b/dlls/quartz/video.c @@ -1,5 +1,5 @@ /* - * Generic Implementation of strmbase video classes + * Common implementation of IBasicVideo * * Copyright 2012 Aric Stewart, CodeWeavers * @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "strmbase_private.h" +#include "quartz_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface) { @@ -647,7 +647,7 @@ static const IBasicVideoVtbl basic_video_vtbl = basic_video_IsUsingDefaultDestination }; -HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, +HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 52d4b1aa62..1b5e68e7d5 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -726,7 +726,7 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) if (FAILED(hr)) goto fail; - hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, + hr = basic_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c457f31e4e..b8cf0698ec 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2257,7 +2257,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVMR->baseControlWindow.baseWindow))) goto fail; - hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, + hr = basic_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 607ce235bb..ec13acccf4 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -9,5 +9,4 @@ C_SRCS = \ pospass.c \ qualitycontrol.c \ renderer.c \ - seeking.c \ - video.c + seeking.c diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f874a44186..0bcac13ebb 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -255,49 +255,6 @@ enum strmbase_type_id HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); -#ifdef __IBasicVideo_FWD_DEFINED__ -#ifdef __amvideo_h__ -typedef struct tagBaseControlVideo -{ - IBasicVideo IBasicVideo_iface; - - struct strmbase_filter *pFilter; - struct strmbase_pin *pPin; - - const struct BaseControlVideoFuncTable* pFuncsTable; -} BaseControlVideo; - -typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); -typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); -typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultTargetRect)(BaseControlVideo* This); -typedef HRESULT (WINAPI *BaseControlVideo_SetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); -typedef HRESULT (WINAPI *BaseControlVideo_SetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); - -typedef struct BaseControlVideoFuncTable { - /* Required */ - BaseControlVideo_GetSourceRect pfnGetSourceRect; - BaseControlVideo_GetStaticImage pfnGetStaticImage; - BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_GetVideoFormat pfnGetVideoFormat; - BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; - BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; - BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; - BaseControlVideo_SetDefaultTargetRect pfnSetDefaultTargetRect; - BaseControlVideo_SetSourceRect pfnSetSourceRect; - BaseControlVideo_SetTargetRect pfnSetTargetRect; -} BaseControlVideoFuncTable; - -HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); -HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); -#endif -#endif - struct strmbase_renderer { struct strmbase_filter filter;

1 0

Zebediah Figura : strmbase: Move window.c to quartz.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: bb8911928fac413530007a7f1f01cb5abdd35b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb8911928fac413530007a7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:11 2020 -0500 strmbase: Move window.c to quartz. The only filters that expose IVideoWindow live in quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 3 +- dlls/quartz/quartz_private.h | 91 ++++++++++++++++++++++++++++++++++++ dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/{strmbase => quartz}/window.c | 16 +++---- dlls/strmbase/Makefile.in | 3 +- include/wine/strmbase.h | 94 -------------------------------------- 7 files changed, 104 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb8911928fac41353000…

1 0

Zebediah Figura : qedit: Pass an IUnknown pointer to the object creation functions.
by Alexandre Julliard March 12, 2020

March 12, 2020

Module: wine Branch: master Commit: 98143898dbab4694cc968b4dd3ebc5eadd5186de URL: https://source.winehq.org/git/wine.git/?a=commit;h=98143898dbab4694cc968b4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 11 21:10:09 2020 -0500 qedit: Pass an IUnknown pointer to the object creation functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 16 ++++++++-------- dlls/qedit/mediadet.c | 3 ++- dlls/qedit/nullrenderer.c | 2 +- dlls/qedit/qedit_private.h | 8 ++++---- dlls/qedit/samplegrabber.c | 2 +- dlls/qedit/timeline.c | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 3797d96dcf..f4d1bbb061 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) typedef struct { IClassFactory IClassFactory_iface; LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); } IClassFactoryImpl; static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) @@ -53,15 +53,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) struct object_creation_info { const CLSID *clsid; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); + HRESULT (*create_instance)(IUnknown *outer, IUnknown **out); }; static const struct object_creation_info object_creation[] = { - { &CLSID_AMTimeline, AMTimeline_create }, - { &CLSID_MediaDet, MediaDet_create }, - { &CLSID_NullRenderer, NullRenderer_create }, - { &CLSID_SampleGrabber, SampleGrabber_create }, + {&CLSID_AMTimeline, timeline_create}, + {&CLSID_MediaDet, media_detector_create}, + {&CLSID_NullRenderer, null_renderer_create}, + {&CLSID_SampleGrabber, sample_grabber_create}, }; static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) @@ -109,7 +109,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) return E_NOINTERFACE; - hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); + hres = This->create_instance(pOuter, &punk); if (SUCCEEDED(hres)) { hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); @@ -186,7 +186,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + factory->create_instance = object_creation[i].create_instance; *ppv = &factory->IClassFactory_iface; return S_OK; diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d5c01aff6b..ecfafc44cb 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -637,7 +637,8 @@ static const IMediaDetVtbl IMediaDet_VTable = MediaDet_EnterBitmapGrabMode, }; -HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { +HRESULT media_detector_create(IUnknown *pUnkOuter, IUnknown **ppv) +{ MediaDetImpl* obj = NULL; TRACE("(%p,%p)\n", pUnkOuter, ppv); diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 575ecea89b..cbebadfd18 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -62,7 +62,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_destroy = null_renderer_destroy, }; -HRESULT NullRenderer_create(IUnknown *outer, void **out) +HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) { HRESULT hr; NullRendererImpl *pNullRenderer; diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 96f21bcb3b..7011c9f70d 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -33,9 +33,9 @@ #include "dshow.h" #include "qedit.h" -HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT NullRenderer_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; -HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT timeline_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT media_detector_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; #endif /* __QEDIT_PRIVATE_INCLUDED__ */ diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9492620d04..7e29154762 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -634,7 +634,7 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = sample_grabber_source_DecideAllocator, }; -HRESULT SampleGrabber_create(IUnknown *outer, void **out) +HRESULT sample_grabber_create(IUnknown *outer, IUnknown **out) { SG_Impl* obj = NULL; ISeekingPassThru *passthru; diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 5d3fb461ff..a00ccdbefb 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -421,7 +421,7 @@ static const IAMTimelineVtbl IAMTimeline_VTable = Timeline_IAMTimeline_GetDefaultEffectB, }; -HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppv) +HRESULT timeline_create(IUnknown *pUnkOuter, IUnknown **ppv) { TimelineImpl* obj = NULL;

1 0

Nikolay Sivov : mf/tests: Remove tests causing occasional crashes on Windows.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 2a2d09c50e564ae16e79b80c598af537b535a82f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2d09c50e564ae16e79b80c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:45 2020 +0300 mf/tests: Remove tests causing occasional crashes on Windows. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a9b0ee34a3..8ebfd0ddee 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -875,14 +875,8 @@ static void test_sequencer_source(void) struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; - HANDLE event; }; -static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) -{ - return CONTAINING_RECORD(iface, struct test_callback, IMFAsyncCallback_iface); -} - static HRESULT WINAPI testcallback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -915,34 +909,8 @@ static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - struct test_callback *callback = impl_from_IMFAsyncCallback(iface); - IMFMediaSession *session; - IUnknown *state, *obj; - HRESULT hr; - ok(result != NULL, "Unexpected result object.\n"); - state = IMFAsyncResult_GetStateNoAddRef(result); - if (state && SUCCEEDED(IUnknown_QueryInterface(state, &IID_IMFMediaSession, (void **)&session))) - { - IMFMediaEvent *event; - - hr = IMFMediaSession_EndGetEvent(session, result, &event); - ok(hr == S_OK, "Failed to finalize GetEvent, hr %#x.\n", hr); - - hr = IMFAsyncResult_GetObject(result, &obj); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - - IMFMediaEvent_Release(event); - - hr = IMFMediaSession_EndGetEvent(session, result, &event); - ok(hr == E_FAIL, "Unexpected result, hr %#x.\n", hr); - - IMFMediaSession_Release(session); - - SetEvent(callback->event); - } - return E_NOTIMPL; } @@ -958,7 +926,6 @@ static const IMFAsyncCallbackVtbl testcallbackvtbl = static void init_test_callback(struct test_callback *callback) { callback->IMFAsyncCallback_iface.lpVtbl = &testcallbackvtbl; - callback->event = NULL; } static void test_session_events(IMFMediaSession *session) @@ -967,7 +934,6 @@ static void test_session_events(IMFMediaSession *session) IMFAsyncResult *result; IMFMediaEvent *event; HRESULT hr; - DWORD ret; init_test_callback(&callback); init_test_callback(&callback2); @@ -998,16 +964,6 @@ static void test_session_events(IMFMediaSession *session) hr = IMFMediaSession_BeginGetEvent(session, &callback2.IMFAsyncCallback_iface, (IUnknown *)&callback.IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#x.\n", hr); - callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - - hr = IMFMediaSession_QueueEvent(session, MEError, &GUID_NULL, E_FAIL, NULL); - ok(hr == S_OK, "Failed to queue event, hr %#x.\n", hr); - - ret = WaitForSingleObject(callback.event, 100); - ok(ret == WAIT_OBJECT_0, "Unexpected return value %#x.\n", ret); - - CloseHandle(callback.event); - hr = MFCreateAsyncResult(NULL, &callback.IMFAsyncCallback_iface, NULL, &result); ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : netapi32: Implement DsGetDcNameW.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 510bea7692971aa31a0b2cca6b6aa9550610b3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=510bea7692971aa31a0b2cca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:42:42 2020 +0800 netapi32: Implement DsGetDcNameW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 2 +- dlls/netapi32/nbt.c | 3 + dlls/netapi32/netapi32.c | 149 +++++++++++++++++++++++++++++++++++++++++++--- include/dsgetdc.h | 7 +++ 4 files changed, 153 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 23da4838f9..13065578ef 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll IMPORTLIB = netapi32 -IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 +IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi C_SRCS = \ nbcmdqueue.c \ diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 4816630334..9c2a731a94 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1437,12 +1437,15 @@ static const WCHAR Config_NetworkW[] = { 'S','o','f','t','w','a','r','e','\\', /* Initializes global variables and registers the NetBT transport */ void NetBTInit(void) { + WSADATA wsa_data; HKEY hKey; NetBIOSTransport transport; LONG ret; TRACE("\n"); + WSAStartup(MAKEWORD(2, 2), &wsa_data); + gEnableDNS = TRUE; gBCastQueries = BCAST_QUERIES; gBCastQueryTimeout = BCAST_QUERY_TIMEOUT; diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d6554aa676..f86e033c21 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -4,6 +4,7 @@ * Copyright 2005,2006 Paul Vriens * Copyright 2006 Robert Reif * Copyright 2013 Hans Leidekker for CodeWeavers + * Copyright 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,9 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winsock2.h" +#include "ws2ipdef.h" +#include "windns.h" #include "lm.h" #include "lmaccess.h" #include "atsvc.h" @@ -56,9 +60,12 @@ #include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static char *strdup_unixcp( const WCHAR *str ) { char *ret; @@ -3033,14 +3040,142 @@ NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( return ERROR_NOT_SUPPORTED; } -DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName, - GUID* DomainGuid, LPCWSTR SiteName, ULONG Flags, - PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo) +#define NS_MAXDNAME 1025 + +static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) { - FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_w(ComputerName), - debugstr_w(AvoidDCName), debugstr_guid(DomainGuid), - debugstr_w(SiteName), Flags, DomainControllerInfo); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR pfx[] = {'_','l','d','a','p','.','_','t','c','p','.','d','c','.','_','m','s','d','c','s','.',0}; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + + lstrcpyW(name, pfx); + lstrcatW(name, domain); + + ret = DnsQuery_W(name, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), ret); + if (ret == ERROR_SUCCESS) + { + TRACE("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + lstrcpynW(dc, rec->Data.Srv.pNameTarget, NS_MAXDNAME); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + ret = DnsQuery_W(dc, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + if (ret == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = IP6_ADDRESS_STRING_LENGTH; + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); + if (!ret) + TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + + DnsRecordListFree(rec, DnsFreeRecordList); + + return ret; + } + + /* IPv6 */ + ret = DnsQuery_W(dc, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + if (ret == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = IP6_ADDRESS_STRING_LENGTH; + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); + if (!ret) + TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + } + + return ret; +} + +DWORD WINAPI DsGetDcNameW(LPCWSTR computer, LPCWSTR domain, GUID *domain_guid, + LPCWSTR site, ULONG flags, PDOMAIN_CONTROLLER_INFOW *dc_info) +{ + static const WCHAR pfxW[] = {'\\','\\'}; + static const WCHAR default_site_nameW[] = {'D','e','f','a','u','l','t','-','F','i','r','s','t','-','S','i','t','e','-','N','a','m','e',0}; + NTSTATUS status; + POLICY_DNS_DOMAIN_INFO *dns_domain_info = NULL; + DOMAIN_CONTROLLER_INFOW *info; + WCHAR dc[NS_MAXDNAME], ip[IP6_ADDRESS_STRING_LENGTH]; + DWORD size; + + FIXME("(%s, %s, %s, %s, %08x, %p): semi-stub\n", debugstr_w(computer), + debugstr_w(domain), debugstr_guid(domain_guid), debugstr_w(site), flags, dc_info); + + if (!dc_info) return ERROR_INVALID_PARAMETER; + + if (!domain) + { + LSA_OBJECT_ATTRIBUTES attrs; + LSA_HANDLE lsa; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + status = LsaOpenPolicy(NULL, &attrs, POLICY_VIEW_LOCAL_INFORMATION, &lsa); + if (status) + return LsaNtStatusToWinError(status); + + status = LsaQueryInformationPolicy(lsa, PolicyDnsDomainInformation, (void **)&dns_domain_info); + LsaClose(lsa); + if (status) + return LsaNtStatusToWinError(status); + + domain = dns_domain_info->DnsDomainName.Buffer; + } + + status = get_dc_info(domain, dc, ip); + if (status) return status; + + size = sizeof(DOMAIN_CONTROLLER_INFOW) + lstrlenW(domain) * sizeof(WCHAR) + + sizeof(pfxW) * 2 + (lstrlenW(dc) + 1 + lstrlenW(ip) + 1) * sizeof(WCHAR) + + lstrlenW(domain) * sizeof(WCHAR) /* assume forest == domain */ + + sizeof(default_site_nameW) * 2; + status = NetApiBufferAllocate(size, (void **)&info); + if (status != NERR_Success) + { + LsaFreeMemory(dns_domain_info); + return ERROR_NOT_ENOUGH_MEMORY; + } + + info->DomainControllerName = (WCHAR *)(info + 1); + memcpy(info->DomainControllerName, pfxW, sizeof(pfxW)); + lstrcpyW(info->DomainControllerName + 2, dc); + info->DomainControllerAddress = (WCHAR *)((char *)info->DomainControllerName + (strlenW(info->DomainControllerName) + 1) * sizeof(WCHAR)); + memcpy(info->DomainControllerAddress, pfxW, sizeof(pfxW)); + lstrcpyW(info->DomainControllerAddress + 2, ip); + info->DomainControllerAddressType = DS_INET_ADDRESS; + info->DomainGuid = dns_domain_info ? dns_domain_info->DomainGuid : GUID_NULL /* FIXME */; + info->DomainName = (WCHAR *)((char *)info->DomainControllerAddress + (strlenW(info->DomainControllerAddress) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DomainName, domain); + info->DnsForestName = (WCHAR *)((char *)info->DomainName + (lstrlenW(info->DomainName) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DnsForestName, domain); + info->DcSiteName = (WCHAR *)((char *)info->DnsForestName + (lstrlenW(info->DnsForestName) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DcSiteName, default_site_nameW); + info->ClientSiteName = (WCHAR *)((char *)info->DcSiteName + sizeof(default_site_nameW)); + lstrcpyW(info->ClientSiteName, default_site_nameW); + info->Flags = DS_DNS_DOMAIN_FLAG | DS_DNS_FOREST_FLAG; + + LsaFreeMemory(dns_domain_info); + + *dc_info = info; + + return ERROR_SUCCESS; } DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, diff --git a/include/dsgetdc.h b/include/dsgetdc.h index c53fcc299a..856912212f 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -23,6 +23,13 @@ extern "C" { #endif +#define DS_INET_ADDRESS 1 +#define DS_NETBIOS_ADDRESS 2 + +#define DS_DNS_CONTROLLER_FLAG 0x20000000 +#define DS_DNS_DOMAIN_FLAG 0x40000000 +#define DS_DNS_FOREST_FLAG 0x80000000 + #define DS_FORCE_REDISCOVERY 0x00000001 #define DS_DIRECTORY_SERVICE_REQUIRED 0x00000010 #define DS_DIRECTORY_SERVICE_PREFERRED 0x00000020

1 0

Dmitry Timoshkov : adsldp: Implement IADsOpenDSObject::OpenDSObject.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: af92668b23b41652ae5d62ff152f0a1301c09363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af92668b23b41652ae5d62ff… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:42:48 2020 +0800 adsldp: Implement IADsOpenDSObject::OpenDSObject. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/adsldp/tests/ldap.c | 2 - 3 files changed, 171 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index cfa84c3fd0..e9c87e68f1 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,6 @@ MODULE = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 +IMPORTS = ole32 oleaut32 secur32 uuid +DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 5432a0abe2..536932c966 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,8 +28,13 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#include "adserr.h" #define SECURITY_WIN32 #include "security.h" +#include "dsgetdc.h" +#include "lmcons.h" +#include "lmapibuf.h" +#include "winldap.h" #include "wine/heap.h" #include "wine/debug.h" @@ -346,6 +351,10 @@ typedef struct IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; + LDAP *ld; + BSTR host; + BSTR object; + ULONG port; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -395,6 +404,9 @@ static ULONG WINAPI ldapns_Release(IADs *iface) if (!ref) { TRACE("destroying %p\n", iface); + if (ldap->ld) ldap_unbind(ldap->ld); + SysFreeString(ldap->host); + SysFreeString(ldap->object); heap_free(ldap); } @@ -601,12 +613,163 @@ static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REF return E_NOTIMPL; } +static HRESULT parse_path(WCHAR *path, BSTR *host, ULONG *port, BSTR *object) +{ + WCHAR *p, *p_host; + int host_len; + + if (host) *host = NULL; + if (port) *port = 0; + if (object) *object = NULL; + + if (wcsnicmp(path, L"LDAP:", 5) != 0) + return E_ADS_BAD_PATHNAME; + + p = path + 5; + if (!*p) return S_OK; + + if (*p++ != '/' || *p++ != '/' || !*p) + return E_ADS_BAD_PATHNAME; + + p_host = p; + host_len = 0; + while (*p && *p != '/') + { + if (*p == ':') + { + ULONG dummy; + if (!port) port = &dummy; + *port = wcstol(p + 1, &p, 10); + if (*p && *p != '/') return E_ADS_BAD_PATHNAME; + } + else + { + p++; + host_len++; + } + } + if (host_len == 0) return E_ADS_BAD_PATHNAME; + + if (host) + { + *host = SysAllocStringLen(p_host, host_len); + if (!*host) return E_OUTOFMEMORY; + } + + if (!*p) return S_OK; + + if (*p++ != '/' || !*p) + { + SysFreeString(*host); + return E_ADS_BAD_PATHNAME; + } + + if (object) + { + *object = SysAllocString(p); + if (!*object) + { + SysFreeString(*host); + return E_OUTOFMEMORY; + } + } + + return S_OK; +} + static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, LONG reserved, IDispatch **obj) { - FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), - reserved, obj); - return E_NOTIMPL; + BSTR host, object; + ULONG port; + IADs *ads; + LDAP *ld = NULL; + HRESULT hr; + ULONG err; + + FIXME("%p,%s,%s,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), reserved, obj); + + hr = parse_path(path, &host, &port, &object); + if (hr != S_OK) return hr; + + TRACE("host %s, port %u, object %s\n", debugstr_w(host), port, debugstr_w(object)); + + if (host) + { + int version; + + if (!wcsicmp(host, L"rootDSE")) + { + DOMAIN_CONTROLLER_INFOW *dcinfo; + + if (object) + { + hr = E_ADS_BAD_PATHNAME; + goto fail; + } + + object = host; + + err = DsGetDcNameW(NULL, NULL, NULL, NULL, DS_RETURN_DNS_NAME, &dcinfo); + if (err != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(LdapGetLastError()); + goto fail; + } + + host = SysAllocString(dcinfo->DomainName); + NetApiBufferFree(dcinfo); + + if (!host) + { + hr = E_OUTOFMEMORY; + goto fail; + } + } + + ld = ldap_initW(host, port); + if (!ld) + { + hr = HRESULT_FROM_WIN32(LdapGetLastError()); + goto fail; + } + + version = LDAP_VERSION3; + err = ldap_set_optionW(ld, LDAP_OPT_PROTOCOL_VERSION, &version); + if (err != LDAP_SUCCESS) + { + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + + err = ldap_connect(ld, NULL); + if (err != LDAP_SUCCESS) + { + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + } + + hr = LDAPNamespace_create(&IID_IADs, (void **)&ads); + if (hr == S_OK) + { + LDAP_namespace *ldap = impl_from_IADs(ads); + ldap->ld = ld; + ldap->host = host; + ldap->port = port; + ldap->object = object; + hr = IADs_QueryInterface(ads, &IID_IDispatch, (void **)obj); + IADs_Release(ads); + return hr; + } + +fail: + SysFreeString(host); + SysFreeString(object); + + return hr; } static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = @@ -632,6 +795,9 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; + ldap->ld = NULL; + ldap->host = NULL; + ldap->object = NULL; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index cc0b42c1c5..c5d97b55df 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -85,9 +85,7 @@ static void test_LDAP(void) path = SysAllocString(L"LDAP:"); hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); SysFreeString(path); -todo_wine ok(hr == S_OK, "got %#x\n", hr); -if (hr == S_OK) IDispatch_Release(disp); IUnknown_Release(unk);

1 0

Paul Gofman : ntdll: Add semi-stub for RtlGetNativeSystemInformation().
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: c6b501acdcabe7d3ebcf5ce13729fd9f4d9176e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b501acdcabe7d3ebcf5ce1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 9 14:59:20 2020 +0300 ntdll: Add semi-stub for RtlGetNativeSystemInformation(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40334 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 20 ++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/info.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f88ded34c1..660d5faf54 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3076,6 +3076,26 @@ NTSTATUS WINAPI NtQuerySystemInformation( return ret; } + +/****************************************************************************** + * RtlGetNativeSystemInformation [NTDLL.@] + */ +NTSTATUS WINAPI /* DECLSPEC_HOTPATCH */ RtlGetNativeSystemInformation( + IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + OUT PVOID SystemInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + FIXME( "semi-stub, SystemInformationClass %#x, SystemInformation %p, Length %#x, ResultLength %p.\n", + SystemInformationClass, SystemInformation, Length, ResultLength ); + + /* RtlGetNativeSystemInformation function is the same as NtQuerySystemInformation on some Win7 + * versions but there are differences for earlier and newer versions, at least: + * - HighestUserAddress field for SystemBasicInformation; + * - Some information classes are not supported by RtlGetNativeSystemInformation. */ + return NtQuerySystemInformation( SystemInformationClass, SystemInformation, Length, ResultLength ); +} + /****************************************************************************** * NtQuerySystemInformationEx [NTDLL.@] * ZwQuerySystemInformationEx [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f1f495837d..0ea72e3aef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -700,7 +700,7 @@ # Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators @ stdcall RtlGetLongestNtPathLength() -# @ stub RtlGetNativeSystemInformation +@ stdcall RtlGetNativeSystemInformation(long ptr long ptr) # @ stub RtlGetNextRange @ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 76de56810c..8dc8bad645 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -75,6 +76,7 @@ static BOOL InitFunctionPtrs(void) } NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(RtlGetNativeSystemInformation); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); @@ -111,7 +113,7 @@ static void test_query_basic(void) { NTSTATUS status; ULONG ReturnLength; - SYSTEM_BASIC_INFORMATION sbi; + SYSTEM_BASIC_INFORMATION sbi, sbi2; /* This test also covers some basic parameter testing that should be the same for * every information class @@ -153,6 +155,38 @@ static void test_query_basic(void) /* Check if we have some return values */ trace("Number of Processors : %d\n", sbi.NumberOfProcessors); ok( sbi.NumberOfProcessors > 0, "Expected more than 0 processors, got %d\n", sbi.NumberOfProcessors); + + memset(&sbi2, 0, sizeof(sbi2)); + status = pRtlGetNativeSystemInformation(SystemBasicInformation, &sbi2, sizeof(sbi2), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); + ok( sizeof(sbi2) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + + ok( sbi.unknown == sbi2.unknown, "Expected unknown %#x, got %#x.\n", sbi.unknown, sbi2.unknown); + ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %u, got %u.\n", + sbi.KeMaximumIncrement, sbi2.KeMaximumIncrement); + ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %u, %u.\n", sbi.PageSize, sbi2.PageSize); + ok( sbi.MmNumberOfPhysicalPages == sbi2.MmNumberOfPhysicalPages, + "Expected MmNumberOfPhysicalPages %u, got %u.\n", + sbi.MmNumberOfPhysicalPages, sbi2.MmNumberOfPhysicalPages); + ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %u, got %u.\n", + sbi.MmLowestPhysicalPage, sbi2.MmLowestPhysicalPage); + ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %u, got %u.\n", + sbi.MmHighestPhysicalPage, sbi2.MmHighestPhysicalPage); + /* Higher 32 bits of AllocationGranularity is sometimes garbage on Windows. */ + ok( (ULONG)sbi.AllocationGranularity == (ULONG)sbi2.AllocationGranularity, + "Expected AllocationGranularity %#lx, got %#lx.\n", + sbi.AllocationGranularity, sbi2.AllocationGranularity); + ok( sbi.LowestUserAddress == sbi2.LowestUserAddress, "Expected LowestUserAddress %p, got %p.\n", + (void *)sbi.LowestUserAddress, (void *)sbi2.LowestUserAddress); + /* Not testing HighestUserAddress. The field is different from NtQuerySystemInformation result + * on 32 bit Windows (some of Win8 versions are the exception). Whenever it is different, + * NtQuerySystemInformation returns user space limit (0x0x7ffeffff) and RtlGetNativeSystemInformation + * returns address space limit (0xfffeffff). */ + ok( sbi.ActiveProcessorsAffinityMask == sbi2.ActiveProcessorsAffinityMask, + "Expected ActiveProcessorsAffinityMask %#lx, got %#lx.\n", + sbi.ActiveProcessorsAffinityMask, sbi2.ActiveProcessorsAffinityMask); + ok( sbi.NumberOfProcessors == sbi2.NumberOfProcessors, "Expected NumberOfProcessors %u, got %u.\n", + sbi.NumberOfProcessors, sbi2.NumberOfProcessors); } static void test_query_cpu(void)

1 0

Piotr Caban : winemac: Handle dummy_surface in get_mac_surface.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: da1e666f57c61f68c77debd6b9ba9aebe0545b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da1e666f57c61f68c77debd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 11 14:45:54 2020 -0500 winemac: Handle dummy_surface in get_mac_surface. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/surface.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 9850c92aaa..85ff56c957 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -70,10 +70,7 @@ struct macdrv_window_surface BITMAPINFO info; /* variable size, must be last */ }; -static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface) -{ - return (struct macdrv_window_surface *)surface; -} +static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface); /*********************************************************************** * update_blit_data @@ -227,6 +224,12 @@ static const struct window_surface_funcs macdrv_surface_funcs = macdrv_surface_destroy, }; +static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface) +{ + if (!surface || surface->funcs != &macdrv_surface_funcs) return NULL; + return (struct macdrv_window_surface *)surface; +} + /*********************************************************************** * create_surface */ @@ -311,7 +314,7 @@ failed: void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) { struct macdrv_window_surface *surface = get_mac_surface(window_surface); - surface->use_alpha = use_alpha; + if (surface) surface->use_alpha = use_alpha; } /*********************************************************************** @@ -424,6 +427,7 @@ void surface_clip_to_visible_rect(struct window_surface *window_surface, const R { struct macdrv_window_surface *surface = get_mac_surface(window_surface); + if (!surface) return; window_surface->funcs->lock(window_surface); if (surface->drawn)

1 0