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

Matteo Bruni : wined3d: Add a TRACE to wined3d_buffer_gl_download_ranges().
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: b2f98ddf4b4ad60e2c73bc13412e6b80c176e6fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2f98ddf4b4ad60e2c73bc13… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:06 2020 +0200 wined3d: Add a TRACE to wined3d_buffer_gl_download_ranges(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dffa703dcc..af83bb9460 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1512,6 +1512,9 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_range *range; + TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", + buffer, context, data, data_offset, range_count, ranges); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--)

1 0

Dmitry Timoshkov : adsldp: Add support for IDirectorySearch::SetSearchPreference(ADS_SEARCHPREF_SECURITY_MASK).
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: af1c34294d30c566a54ea3cd80c3fa6353eec352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1c34294d30c566a54ea3cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 2 17:16:59 2020 +0800 adsldp: Add support for IDirectorySearch::SetSearchPreference(ADS_SEARCHPREF_SECURITY_MASK). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/adsldp/tests/ldap.c | 36 +++++++++++++++++++++++++++++- include/iads.idl | 8 +++++++ include/winldap.h | 2 ++ 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b2a8e61815..9a52d78500 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -45,6 +45,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(adsldp); +#ifndef LDAP_OPT_SERVER_CONTROLS +#define LDAP_OPT_SERVER_CONTROLS 0x0012 +#endif + DEFINE_GUID(CLSID_LDAP,0x228d9a81,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); DEFINE_GUID(CLSID_LDAPNamespace,0x228d9a82,0xc302,0x11cf,0x9a,0xa4,0x00,0xaa,0x00,0x4a,0x56,0x91); @@ -1127,6 +1131,7 @@ static ULONG WINAPI search_Release(IDirectorySearch *iface) static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) { LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + HRESULT hr = S_OK; DWORD i; TRACE("%p,%p,%u\n", iface, prefs, count); @@ -1159,6 +1164,56 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S } break; + case ADS_SEARCHPREF_SECURITY_MASK: + { + int security_mask; + ULONG err; + BerElement *ber; + struct berval *berval; + LDAPControlW *ctrls[2], mask; + + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("SECURITY_MASK: %08x\n", prefs[i].vValue.u.Integer); + security_mask = prefs[i].vValue.u.Integer; + if (!security_mask) + security_mask = ADS_SECURITY_INFO_OWNER; + + ber = ber_alloc_t(LBER_USE_DER); + if (!ber || ber_printf(ber, (char *)"{i}", security_mask) == -1 || ber_flatten(ber, &berval) == -1) + { + ber_free(ber, 1); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; + break; + } + TRACE("ber: %s\n", debugstr_an(berval->bv_val, berval->bv_len)); + + mask.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.801"; + mask.ldctl_iscritical = TRUE; + mask.ldctl_value.bv_val = berval->bv_val; + mask.ldctl_value.bv_len = berval->bv_len; + ctrls[0] = &mask; + ctrls[1] = NULL; + err = ldap_set_optionW(ldap->ld, LDAP_OPT_SERVER_CONTROLS, ctrls); + if (err != LDAP_SUCCESS) + { + TRACE("ldap_set_option error %#x\n", err); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; + hr = S_ADS_ERRORSOCCURRED; + } + else + prefs[i].dwStatus = ADS_STATUS_S_OK; + + ber_bvfree(berval); + ber_free(ber, 1); + break; + } + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1166,7 +1221,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S } } - return S_OK; + return hr; } static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 998581e2f8..80815b07a0 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -465,6 +465,9 @@ static void test_DirectoryObject(void) IDirectoryObject *dirobj; IUnknown *unk; IDirectorySearch *ds; + ADS_SEARCHPREF_INFO pref[2]; + ADS_SEARCH_HANDLE sh; + ADS_SEARCH_COLUMN col; hr = ADsGetObject(L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", &IID_IDirectoryObject, (void **)&dirobj); if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) @@ -485,8 +488,39 @@ todo_wine IUnknown_Release(unk); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDirectorySearch, (void **)&ds); ok(hr == S_OK, "got %#x\n", hr); - IDirectorySearch_Release(ds); + pref[0].dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref[0].vValue.dwType = ADSTYPE_INTEGER; + pref[0].vValue.Integer = ADS_SCOPE_BASE; + pref[0].dwStatus = 0xdeadbeef; + pref[1].dwSearchPref = ADS_SEARCHPREF_SECURITY_MASK; + pref[1].vValue.dwType = ADSTYPE_INTEGER; + pref[1].vValue.Integer = ADS_SECURITY_INFO_OWNER | ADS_SECURITY_INFO_GROUP | ADS_SECURITY_INFO_DACL; + pref[1].dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, pref, ARRAY_SIZE(pref)); +todo_wine + ok(hr == S_ADS_ERRORSOCCURRED, "got %#x\n", hr); + ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); + /* ldap.forumsys.com doesn't support NT security, real ADs DC - does */ +todo_wine + ok(pref[1].dwStatus == ADS_STATUS_INVALID_SEARCHPREF, "got %d\n", pref[1].dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); +todo_wine + ok(hr == S_OK, "got %#x\n", hr); + if (hr != S_OK) goto fail; + + hr = IDirectorySearch_GetNextRow(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"nTSecurityDescriptor", &col); + ok(hr == E_ADS_COLUMN_NOT_SET, "got %#x\n", hr); + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + IDirectorySearch_Release(ds); +fail: IDirectoryObject_Release(dirobj); } diff --git a/include/iads.idl b/include/iads.idl index b04ed0846a..e9eaab77be 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -362,6 +362,14 @@ typedef struct _ads_attr_info DWORD dwNumValues; } ADS_ATTR_INFO, *PADS_ATTR_INFO; +typedef enum +{ + ADS_SECURITY_INFO_OWNER = 0x1, + ADS_SECURITY_INFO_GROUP = 0x2, + ADS_SECURITY_INFO_DACL = 0x4, + ADS_SECURITY_INFO_SACL = 0x8 +} ADS_SECURITY_INFO_ENUM; + /***************************************************************************** * IADsContainer interface */ diff --git a/include/winldap.h b/include/winldap.h index bd5acab767..2d41eaa3fa 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -104,6 +104,8 @@ typedef enum { #define LDAP_SCOPE_ONELEVEL 0x01 #define LDAP_SCOPE_SUBTREE 0x02 +#define LBER_USE_DER 0x01 + typedef struct berelement { PCHAR opaque;

1 0

Dmitry Timoshkov : adsldp: Forward IDirectoryObject::QueryInterface() to parent.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 0d49dcd39f47f697bcf21244cc6e5dd889b3bf92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d49dcd39f47f697bcf21244… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 2 17:16:08 2020 +0800 adsldp: Forward IDirectoryObject::QueryInterface() to parent. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 5 +++-- dlls/adsldp/tests/ldap.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 9a3ac63407..b2a8e61815 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1573,6 +1573,8 @@ static inline LDAP_namespace *impl_from_IDirectoryObject(IDirectoryObject *iface static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid, void **obj) { + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); if (!riid || !obj) return E_INVALIDARG; @@ -1585,8 +1587,7 @@ static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid return S_OK; } - FIXME("interface %s is not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; + return IADs_QueryInterface(&ldap->IADs_iface, riid, obj); } static ULONG WINAPI dirobj_AddRef(IDirectoryObject *iface) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 120e77053a..998581e2f8 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -459,6 +459,37 @@ todo_wine do_search(&scientists_subtree); } +static void test_DirectoryObject(void) +{ + HRESULT hr; + IDirectoryObject *dirobj; + IUnknown *unk; + IDirectorySearch *ds; + + hr = ADsGetObject(L"LDAP://ldap.forumsys.com/OU=scientists,DC=example,DC=com", &IID_IDirectoryObject, (void **)&dirobj); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk); +todo_wine + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + IUnknown_Release(unk); + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADs, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + IUnknown_Release(unk); + hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDirectorySearch, (void **)&ds); + ok(hr == S_OK, "got %#x\n", hr); + IDirectorySearch_Release(ds); + + IDirectoryObject_Release(dirobj); +} + START_TEST(ldap) { HRESULT hr; @@ -469,6 +500,7 @@ START_TEST(ldap) test_LDAP(); test_ParseDisplayName(); test_DirectorySearch(); + test_DirectoryObject(); CoUninitialize(); }

1 0

Francois Gouget : gameux/tests: Remove unneeded parentheses around a gamestatistics string.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: c1e282d0f9eaa6835df25b93fa5a313479723434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e282d0f9eaa6835df25b93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 2 11:09:57 2020 +0200 gameux/tests: Remove unneeded parentheses around a gamestatistics string. wine_dbgstr_w() already quotes the string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 8d4da4a0f4..192a245e09 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -295,17 +295,17 @@ static void test_gamestatisticsmgr( void ) /* verify values with these which we stored before*/ hr = IGameStatistics_GetCategoryTitle(gs, 0, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 1, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 2, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string (%s)\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); /* check result if category doesn't exists */

1 0

Zebediah Figura : quartz/vmr9: Get rid of the VMR9DefaultAllocatorPresenterImpl typedef.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 4820290ac0081e1705922e678c81079e6e7ddcf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4820290ac0081e1705922e67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:04 2020 -0500 quartz/vmr9: Get rid of the VMR9DefaultAllocatorPresenterImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 58fbef5433..07a3dbc241 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -151,7 +151,7 @@ static inline struct quartz_vmr *impl_from_IVMRWindowlessControl9(IVMRWindowless return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRWindowlessControl9_iface); } -typedef struct +struct default_presenter { IVMRImagePresenter9 IVMRImagePresenter9_iface; IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9_iface; @@ -170,16 +170,16 @@ typedef struct struct quartz_vmr* pVMR9; IVMRSurfaceAllocatorNotify9 *SurfaceAllocatorNotify; -} VMR9DefaultAllocatorPresenterImpl; +}; -static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRImagePresenter9( IVMRImagePresenter9 *iface) +static inline struct default_presenter *impl_from_IVMRImagePresenter9(IVMRImagePresenter9 *iface) { - return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRImagePresenter9_iface); + return CONTAINING_RECORD(iface, struct default_presenter, IVMRImagePresenter9_iface); } -static inline VMR9DefaultAllocatorPresenterImpl *impl_from_IVMRSurfaceAllocatorEx9( IVMRSurfaceAllocatorEx9 *iface) +static inline struct default_presenter *impl_from_IVMRSurfaceAllocatorEx9(IVMRSurfaceAllocatorEx9 *iface) { - return CONTAINING_RECORD(iface, VMR9DefaultAllocatorPresenterImpl, IVMRSurfaceAllocatorEx9_iface); + return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocatorEx9_iface); } static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); @@ -2358,7 +2358,8 @@ HRESULT vmr9_create(IUnknown *outer, IUnknown **out) static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, void **ppv) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -2381,7 +2382,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); @@ -2391,7 +2392,7 @@ static ULONG WINAPI VMR9_ImagePresenter_AddRef(IVMRImagePresenter9 *iface) static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); @@ -2427,7 +2428,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; @@ -2435,7 +2436,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *i static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; @@ -2444,7 +2445,7 @@ static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *if #define USED_FVF (D3DFVF_XYZRHW | D3DFVF_TEX1) struct VERTEX { float x, y, z, rhw, u, v; }; -static HRESULT VMR9_ImagePresenter_PresentTexture(VMR9DefaultAllocatorPresenterImpl *This, IDirect3DSurface9 *surface) +static HRESULT VMR9_ImagePresenter_PresentTexture(struct default_presenter *This, IDirect3DSurface9 *surface) { IDirect3DTexture9 *texture = NULL; HRESULT hr; @@ -2487,7 +2488,7 @@ static HRESULT VMR9_ImagePresenter_PresentTexture(VMR9DefaultAllocatorPresenterI return S_OK; } -static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorPresenterImpl *This, IDirect3DSurface9 *surface) +static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presenter *This, IDirect3DSurface9 *surface) { HRESULT hr; IDirect3DSurface9 *target = NULL; @@ -2514,7 +2515,7 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorP static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR id, VMR9PresentationInfo *info) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); HRESULT hr; RECT output; BOOL render = FALSE; @@ -2565,26 +2566,26 @@ static const IVMRImagePresenter9Vtbl VMR9_ImagePresenter = static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocatorEx9 *iface, REFIID riid, LPVOID * ppv) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); return VMR9_ImagePresenter_QueryInterface(&This->IVMRImagePresenter9_iface, riid, ppv); } static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocatorEx9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); return VMR9_ImagePresenter_AddRef(&This->IVMRImagePresenter9_iface); } static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); } -static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(VMR9DefaultAllocatorPresenterImpl *This, VMR9AllocationInfo *allocinfo) +static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presenter *This, VMR9AllocationInfo *allocinfo) { D3DCAPS9 caps; UINT width, height; @@ -2660,7 +2661,7 @@ static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_ou return d3d9_adapter; } -static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9AllocationInfo *info, DWORD *numbuffers) +static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9AllocationInfo *info, DWORD *numbuffers) { D3DPRESENT_PARAMETERS d3dpp; DWORD d3d9_adapter; @@ -2714,7 +2715,7 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); if (This->pVMR9->mode != VMR9Mode_Windowed && !This->pVMR9->hWndClippingWindow) { @@ -2741,7 +2742,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator } /* Recreate all surfaces (If allocated as D3DPOOL_DEFAULT) and survive! */ -static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPresenterImpl *This) +static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter *This) { struct VERTEX t_vert[4]; UINT width, height; @@ -2846,7 +2847,7 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); /* Update everything first, this is needed because the surface might be destroyed in the reset */ if (!This->d3d9_dev) @@ -2870,7 +2871,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 *iface, IVMRSurfaceAllocatorNotify9 *allocnotify) { - VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); TRACE("(%p/%p)->(...)\n", iface, This); @@ -2903,7 +2904,7 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) { - VMR9DefaultAllocatorPresenterImpl *object; + struct default_presenter *object; HRESULT hr = S_OK; int i;

1 0

Zebediah Figura : quartz/vmr9: Use calloc().
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: a273a0e71fe0a217e9b7b3632d756b793b4c7dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a273a0e71fe0a217e9b7b363… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:03 2020 -0500 quartz/vmr9: Use calloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 119 ++++++++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 69 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index c44607b3ef..58fbef5433 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -597,7 +597,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) FreeLibrary(filter->hD3d9); BaseControlWindow_Destroy(&filter->baseControlWindow); strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); InterlockedDecrement(&object_locks); } @@ -2291,69 +2291,57 @@ static const IOverlayVtbl overlay_vtbl = static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) { + struct quartz_vmr *object; HRESULT hr; - struct quartz_vmr* pVMR; - *out = NULL; - - pVMR = CoTaskMemAlloc(sizeof(struct quartz_vmr)); + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - pVMR->hD3d9 = LoadLibraryA("d3d9.dll"); - if (!pVMR->hD3d9 ) + object->hD3d9 = LoadLibraryA("d3d9.dll"); + if (!object->hD3d9) { WARN("Could not load d3d9.dll\n"); - CoTaskMemFree(pVMR); + free(object); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } - pVMR->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; - pVMR->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; - - pVMR->mode = 0; - pVMR->allocator_d3d9_dev = NULL; - pVMR->allocator_mon= NULL; - pVMR->num_surfaces = pVMR->cur_surface = 0; - pVMR->allocator = NULL; - pVMR->presenter = NULL; - pVMR->hWndClippingWindow = NULL; - pVMR->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; - pVMR->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; - pVMR->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; - pVMR->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; - pVMR->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl; - pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; - pVMR->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; - pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; - pVMR->IOverlay_iface.lpVtbl = &overlay_vtbl; - - strmbase_renderer_init(&pVMR->renderer, outer, clsid, L"VMR Input0", &renderer_ops); - - hr = video_window_init(&pVMR->baseControlWindow, &IVideoWindow_VTable, - &pVMR->renderer.filter, &pVMR->renderer.sink.pin, &renderer_BaseWindowFuncTable); + strmbase_renderer_init(&object->renderer, outer, clsid, L"VMR Input0", &renderer_ops); + object->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; + object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; + object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + object->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; + object->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; + object->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl; + object->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl; + object->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl; + object->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; + object->IOverlay_iface.lpVtbl = &overlay_vtbl; + + hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; - if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVMR->baseControlWindow.baseWindow))) + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; - hr = basic_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, - &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); + hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; - pVMR->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - *out = &pVMR->renderer.filter.IUnknown_inner; - ZeroMemory(&pVMR->source_rect, sizeof(RECT)); - ZeroMemory(&pVMR->target_rect, sizeof(RECT)); - TRACE("Created at %p\n", pVMR); + TRACE("Created VMR %p.\n", object); + *out = &object->renderer.filter.IUnknown_inner; return hr; fail: - BaseWindowImpl_DoneWithWindow(&pVMR->baseControlWindow.baseWindow); - strmbase_renderer_cleanup(&pVMR->renderer); - FreeLibrary(pVMR->hD3d9); - CoTaskMemFree(pVMR); + BaseWindowImpl_DoneWithWindow(&object->baseControlWindow.baseWindow); + strmbase_renderer_cleanup(&object->renderer); + FreeLibrary(object->hD3d9); + free(object); return hr; } @@ -2423,7 +2411,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9_Release(surface); } - CoTaskMemFree(This->d3d9_surfaces); + free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0; if (This->d3d9_vertex) @@ -2431,7 +2419,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DVertexBuffer9_Release(This->d3d9_vertex); This->d3d9_vertex = NULL; } - CoTaskMemFree(This); + free(This); return 0; } return refCount; @@ -2699,8 +2687,8 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A } IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); - This->d3d9_surfaces = CoTaskMemAlloc(*numbuffers * sizeof(IDirect3DSurface9 *)); - ZeroMemory(This->d3d9_surfaces, *numbuffers * sizeof(IDirect3DSurface9 *)); + if (!(This->d3d9_surfaces = calloc(*numbuffers, sizeof(IDirect3DSurface9 *)))) + return FALSE; hr = VMR9_SurfaceAllocator_SetAllocationSettings(This, info); if (FAILED(hr)) @@ -2915,19 +2903,18 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) { + VMR9DefaultAllocatorPresenterImpl *object; HRESULT hr = S_OK; int i; - VMR9DefaultAllocatorPresenterImpl* This; - This = CoTaskMemAlloc(sizeof(VMR9DefaultAllocatorPresenterImpl)); - if (!This) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - This->d3d9_ptr = init_d3d9(parent->hD3d9); - if (!This->d3d9_ptr) + object->d3d9_ptr = init_d3d9(parent->hD3d9); + if (!object->d3d9_ptr) { WARN("Could not initialize d3d9.dll\n"); - CoTaskMemFree(This); + free(object); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } @@ -2936,7 +2923,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren { D3DDISPLAYMODE mode; - hr = IDirect3D9_EnumAdapterModes(This->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); + hr = IDirect3D9_EnumAdapterModes(object->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); if (hr == D3DERR_INVALIDCALL) break; /* out of adapters */ } while (FAILED(hr)); if (FAILED(hr)) @@ -2944,24 +2931,18 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren if (hr == D3DERR_NOTAVAILABLE) { ERR("Format not supported\n"); - IDirect3D9_Release(This->d3d9_ptr); - CoTaskMemFree(This); + IDirect3D9_Release(object->d3d9_ptr); + free(object); return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } - This->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; - This->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; + object->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; + object->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; - This->refCount = 1; - This->pVMR9 = parent; - This->d3d9_surfaces = NULL; - This->d3d9_dev = NULL; - This->hMon = 0; - This->d3d9_vertex = NULL; - This->num_surfaces = 0; - This->SurfaceAllocatorNotify = NULL; - This->reset = FALSE; + object->refCount = 1; + object->pVMR9 = parent; - *ppv = &This->IVMRImagePresenter9_iface; + TRACE("Created default presenter %p.\n", object); + *ppv = &object->IVMRImagePresenter9_iface; return S_OK; }

1 0

Zebediah Figura : quartz/videorenderer: Get rid of the VideoRendererImpl typedef.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 33f11bce82d53dce1c1195ad4937b31d9867fea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f11bce82d53dce1c1195ad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:02 2020 -0500 quartz/videorenderer: Get rid of the VideoRendererImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33f11bce82d53dce1c11…

1 0

Zebediah Figura : quartz/videorenderer: Use calloc() in video_renderer_create().
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: c2fa5cb5476d866de2c30af4b76333e9dfb4b500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2fa5cb5476d866de2c30af4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:01 2020 -0500 quartz/videorenderer: Use calloc() in video_renderer_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9301e8d769..8fb3a9e422 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -247,7 +247,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) BaseControlVideo_Destroy(&filter->baseControlVideo); CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); InterlockedDecrement(&object_locks); } @@ -701,46 +701,38 @@ static const IOverlayVtbl overlay_vtbl = HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) { + VideoRendererImpl *object; HRESULT hr; - VideoRendererImpl * pVideoRenderer; - *out = NULL; - - pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); - - pVideoRenderer->init = FALSE; - ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); - ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); - ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); - pVideoRenderer->FullScreenMode = OAFALSE; - - pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - strmbase_renderer_init(&pVideoRenderer->renderer, outer, - &CLSID_VideoRenderer, L"In", &renderer_ops); + strmbase_renderer_init(&object->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops); + object->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = video_window_init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, + hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, + &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseWindowFuncTable); if (FAILED(hr)) goto fail; - hr = basic_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, - &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); + hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; - if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) + if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; - pVideoRenderer->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - *out = &pVideoRenderer->renderer.filter.IUnknown_inner; + TRACE("Created video renderer %p.\n", object); + *out = &object->renderer.filter.IUnknown_inner; return S_OK; fail: - strmbase_renderer_cleanup(&pVideoRenderer->renderer); - CoTaskMemFree(pVideoRenderer); + strmbase_renderer_cleanup(&object->renderer); + free(object); return hr; }

1 0

Alexandre Julliard : krnl386: Build with msvcrt.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 024f9ebd1a1aaf07b853f00efca9480d956312bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=024f9ebd1a1aaf07b853f00e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 10:54:08 2020 +0200 krnl386: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 ++-- dlls/krnl386.exe16/atom.c | 4 ---- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/dosmem.c | 6 ------ dlls/krnl386.exe16/file.c | 5 +---- dlls/krnl386.exe16/global.c | 12 ------------ dlls/krnl386.exe16/instr.c | 3 --- dlls/krnl386.exe16/int21.c | 23 +++++++---------------- dlls/krnl386.exe16/int25.c | 6 +----- dlls/krnl386.exe16/int26.c | 6 +----- dlls/krnl386.exe16/int2f.c | 2 -- dlls/krnl386.exe16/int31.c | 3 --- dlls/krnl386.exe16/interrupts.c | 2 -- dlls/krnl386.exe16/ioports.c | 6 ------ dlls/krnl386.exe16/kernel.c | 2 ++ dlls/krnl386.exe16/kernel16_private.h | 1 - dlls/krnl386.exe16/local.c | 3 --- dlls/krnl386.exe16/ne_module.c | 10 ---------- dlls/krnl386.exe16/ne_segment.c | 21 +++------------------ dlls/krnl386.exe16/relay.c | 9 ++------- dlls/krnl386.exe16/resource.c | 32 ++++++++++++++------------------ dlls/krnl386.exe16/selector.c | 3 --- dlls/krnl386.exe16/snoop.c | 4 ---- dlls/krnl386.exe16/syslevel.c | 7 +------ dlls/krnl386.exe16/task.c | 6 ------ dlls/krnl386.exe16/thunk.c | 7 ------- dlls/krnl386.exe16/vxd.c | 25 +++++++------------------ dlls/krnl386.exe16/wowthunk.c | 6 ------ 28 files changed, 41 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=024f9ebd1a1aaf07b853…

1 0

Alexandre Julliard : makefiles: Always build 16-bit modules with msvcrt.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: fbbad0f10ae6e7d8bba405290ffc76f1fa6907ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbbad0f10ae6e7d8bba40529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 11:09:19 2020 +0200 makefiles: Always build 16-bit modules with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/Makefile.in | 2 +- dlls/commdlg.dll16/Makefile.in | 2 +- dlls/compobj.dll16/Makefile.in | 2 +- dlls/ctl3d.dll16/Makefile.in | 2 +- dlls/ctl3dv2.dll16/Makefile.in | 2 +- dlls/ddeml.dll16/Makefile.in | 2 +- dlls/dispdib.dll16/Makefile.in | 2 +- dlls/display.drv16/Makefile.in | 2 +- dlls/gdi.exe16/Makefile.in | 2 +- dlls/keyboard.drv16/Makefile.in | 2 +- dlls/krnl386.exe16/Makefile.in | 2 +- dlls/lzexpand.dll16/Makefile.in | 2 +- dlls/mmsystem.dll16/Makefile.in | 2 +- dlls/mouse.drv16/Makefile.in | 2 +- dlls/msacm.dll16/Makefile.in | 2 +- dlls/msvideo.dll16/Makefile.in | 2 +- dlls/ole2.dll16/Makefile.in | 2 +- dlls/ole2disp.dll16/Makefile.in | 2 +- dlls/ole2nls.dll16/Makefile.in | 2 +- dlls/olecli.dll16/Makefile.in | 2 +- dlls/olesvr.dll16/Makefile.in | 2 +- dlls/setupx.dll16/Makefile.in | 2 +- dlls/shell.dll16/Makefile.in | 2 +- dlls/sound.drv16/Makefile.in | 2 +- dlls/storage.dll16/Makefile.in | 2 +- dlls/stress.dll16/Makefile.in | 2 +- dlls/system.drv16/Makefile.in | 2 +- dlls/toolhelp.dll16/Makefile.in | 2 +- dlls/twain.dll16/Makefile.in | 2 +- dlls/typelib.dll16/Makefile.in | 2 +- dlls/user.exe16/Makefile.in | 2 +- dlls/ver.dll16/Makefile.in | 2 +- dlls/w32sys.dll16/Makefile.in | 2 +- dlls/win32s16.dll16/Makefile.in | 2 +- dlls/win87em.dll16/Makefile.in | 2 +- dlls/winaspi.dll16/Makefile.in | 2 +- dlls/windebug.dll16/Makefile.in | 2 +- dlls/wineps16.drv16/Makefile.in | 2 +- dlls/wing.dll16/Makefile.in | 2 +- dlls/winnls.dll16/Makefile.in | 2 +- dlls/winsock.dll16/Makefile.in | 2 +- dlls/wintab.dll16/Makefile.in | 2 +- programs/rundll.exe16/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 2 +- tools/makedep.c | 6 +++--- 46 files changed, 48 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbbad0f10ae6e7d8bba4…

1 0