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

Dmitry Timoshkov : activeds: Make IADsPathname::Set() and IADsPathname::Retrieve() return success.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: ba82c34b1b01a592ea01cd8399c4346f1e8f42b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba82c34b1b01a592ea01cd83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 1 18:18:37 2020 +0800 activeds: Make IADsPathname::Set() and IADsPathname::Retrieve() return success. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 63b86ab778..52a94cbb18 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -39,6 +39,7 @@ typedef struct { IADsPathname IADsPathname_iface; LONG ref; + BSTR adspath; } Pathname; static inline Pathname *impl_from_IADsPathname(IADsPathname *iface) @@ -112,10 +113,16 @@ static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID rii return E_NOTIMPL; } -static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR path, LONG type) +static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) { - FIXME("%p,%s,%d: stub\n", iface, debugstr_w(path), type); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + + FIXME("%p,%s,%d: stub\n", iface, debugstr_w(adspath), type); + + if (!adspath) return E_INVALIDARG; + + path->adspath = SysAllocString(adspath); + return path->adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) @@ -124,10 +131,16 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) return E_NOTIMPL; } -static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *path) +static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspath) { - FIXME("%p,%d,%p: stub\n", iface, type, path); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + + FIXME("%p,%d,%p: stub\n", iface, type, adspath); + + if (!adspath) return E_INVALIDARG; + + *adspath = SysAllocString(path->adspath); + return *adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) @@ -210,6 +223,7 @@ static HRESULT Pathname_create(REFIID riid, void **obj) path->IADsPathname_iface.lpVtbl = &IADsPathname_vtbl; path->ref = 1; + path->adspath = NULL; hr = IADsPathname_QueryInterface(&path->IADsPathname_iface, riid, obj); IADsPathname_Release(&path->IADsPathname_iface);

1 0

Sven Baars : d3dx9: Handle horizontal alignment in ID3DXFont_DrawText.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: d511853d45bc3302b2a4501b1aa0097a4e78b3d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d511853d45bc3302b2a4501b… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 27 17:48:34 2020 +0100 d3dx9: Handle horizontal alignment in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 23 ++++++- dlls/d3dx9_36/tests/core.c | 162 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 182 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d511853d45bc3302b2a4…

1 0

Zhipeng Zhao : explorer: Support '/cd,' command line option.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 9d79746425ba2e292f85f656227d703672076499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d79746425ba2e292f85f656… Author: Zhipeng Zhao <near2see(a)163.com> Date: Fri Mar 27 15:14:52 2020 +0800 explorer: Support '/cd,' command line option. '/cd,' is an undocumented option that seems to have the same effect as '/root,'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48816. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index dcd09ac969..763fca381b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -718,6 +718,7 @@ static void copy_path_root(LPWSTR root, LPWSTR path) * Command Line parameters are: * [/n] Opens in single-paned view for each selected items. This is default * [/e,] Uses Windows Explorer View + * [/cd,object] Specifies the root level of the view * [/root,object] Specifies the root level of the view * [/select,object] parent folder is opened and specified object is selected */ @@ -725,6 +726,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) { static const WCHAR arg_n[] = {'/','n'}; static const WCHAR arg_e[] = {'/','e',','}; + static const WCHAR arg_cd[] = {'/','c','d',','}; static const WCHAR arg_root[] = {'/','r','o','o','t',','}; static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; @@ -745,6 +747,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) parameters->explorer_mode = TRUE; p += ARRAY_SIZE( arg_e ); } + else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + { + p += ARRAY_SIZE( arg_cd ); + p = copy_path_string(parameters->root,p); + } else if (wcsncmp(p, arg_root, ARRAY_SIZE( arg_root ))==0) { p += ARRAY_SIZE( arg_root );

1 0

Dmitry Timoshkov : adsldp: Add IDirectoryObject stubs.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 59c7e1977cd2d53c6ee755641073e15e075093de URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c7e1977cd2d53c6ee75564… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 1 18:18:39 2020 +0800 adsldp: Add IDirectoryObject stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 35 +++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c4557667cc..9a3ac63407 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -383,6 +383,7 @@ typedef struct IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; IDirectorySearch IDirectorySearch_iface; + IDirectoryObject IDirectoryObject_iface; LONG ref; LDAP *ld; BSTR host; @@ -445,6 +446,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectoryObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IDirectoryObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1558,6 +1566,86 @@ static const IDirectorySearchVtbl IDirectorySearch_vtbl = search_CloseSearchHandle }; +static inline LDAP_namespace *impl_from_IDirectoryObject(IDirectoryObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IDirectoryObject_iface); +} + +static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IDirectoryObject) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IDirectoryObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI dirobj_AddRef(IDirectoryObject *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + return IADs_AddRef(&ldap->IADs_iface); +} + +static ULONG WINAPI dirobj_Release(IDirectoryObject *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + return IADs_Release(&ldap->IADs_iface); +} + +static HRESULT WINAPI dirobj_GetObjectInformation(IDirectoryObject *iface, PADS_OBJECT_INFO *info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_GetObjectAttributes(IDirectoryObject *iface, LPWSTR *names, + DWORD count, PADS_ATTR_INFO *attrs, DWORD *count_returned) +{ + FIXME("%p,%p,%u,%p,%p: stub\n", iface, names, count, attrs, count_returned); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_SetObjectAttributes(IDirectoryObject *iface, PADS_ATTR_INFO attrs, + DWORD count, DWORD *count_set) +{ + FIXME("%p,%p,%u,%p: stub\n", iface, attrs, count, count_set); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_CreateDSObject(IDirectoryObject *iface, LPWSTR name, + PADS_ATTR_INFO attrs, DWORD count, IDispatch **obj) +{ + FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(name), attrs, count, obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_DeleteDSObject(IDirectoryObject *iface, LPWSTR name) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static const IDirectoryObjectVtbl IDirectoryObject_vtbl = +{ + dirobj_QueryInterface, + dirobj_AddRef, + dirobj_Release, + dirobj_GetObjectInformation, + dirobj_GetObjectAttributes, + dirobj_SetObjectAttributes, + dirobj_CreateDSObject, + dirobj_DeleteDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -1569,6 +1657,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->IDirectorySearch_iface.lpVtbl = &IDirectorySearch_vtbl; + ldap->IDirectoryObject_iface.lpVtbl = &IDirectoryObject_vtbl; ldap->ref = 1; ldap->ld = NULL; ldap->host = NULL; diff --git a/include/iads.idl b/include/iads.idl index c9d1687524..b04ed0846a 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -344,6 +344,24 @@ typedef struct ads_search_column HANDLE hReserved; } ADS_SEARCH_COLUMN, *PADS_SEARCH_COLUMN; +typedef struct _ads_object_info +{ + LPWSTR pszRDN; + LPWSTR pszObjectDN; + LPWSTR pszParentDN; + LPWSTR pszSchemaDN; + LPWSTR pszClassName; +} ADS_OBJECT_INFO, *PADS_OBJECT_INFO; + +typedef struct _ads_attr_info +{ + LPWSTR pszAttrName; + DWORD dwControlCode; + ADSTYPE dwADsType; + PADSVALUE pADsValues; + DWORD dwNumValues; +} ADS_ATTR_INFO, *PADS_ATTR_INFO; + /***************************************************************************** * IADsContainer interface */ @@ -799,6 +817,23 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IDirectoryObject interface + */ +[ + odl, + local, + uuid(e798de2c-22e4-11d0-84fe-00c04fd8d503) +] +interface IDirectoryObject : IUnknown +{ + HRESULT GetObjectInformation(PADS_OBJECT_INFO *info); + HRESULT GetObjectAttributes(LPWSTR *names, DWORD count, PADS_ATTR_INFO *attrs, DWORD *count_returned); + HRESULT SetObjectAttributes(PADS_ATTR_INFO attrs, DWORD count, DWORD *count_set); + HRESULT CreateDSObject(LPWSTR name, PADS_ATTR_INFO attrs, DWORD count, IDispatch **obj); + HRESULT DeleteDSObject(LPWSTR name); +} + /***************************************************************************** * IID_IADsOpenDSObject interface */

1 0

Zebediah Figura : quartz/dsoundrender: Use calloc() in dsound_render_create().
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: e1bdc1e7a001a8efb203186e7dd7d1d62a3e302e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bdc1e7a001a8efb203186e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:18 2020 -0500 quartz/dsoundrender: Use calloc() in dsound_render_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e4a39239e5..00b2a5a2be 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -502,7 +502,7 @@ static void dsound_render_destroy(struct strmbase_renderer *iface) filter->dsound = NULL; strmbase_renderer_cleanup(&filter->renderer); - CoTaskMemFree(filter); + free(filter); InterlockedDecrement(&object_locks); } @@ -821,9 +821,8 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) DSoundRenderImpl *object; HRESULT hr; - if (!(object = CoTaskMemAlloc(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - memset(object, 0, sizeof(*object)); strmbase_renderer_init(&object->renderer, outer, &CLSID_DSoundRender, L"Audio Input pin (rendered)", &renderer_ops); @@ -831,7 +830,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) if (FAILED(hr = system_clock_create(&object->renderer.filter.IUnknown_inner, &object->system_clock))) { strmbase_renderer_cleanup(&object->renderer); - CoTaskMemFree(object); + free(object); return hr; } @@ -842,7 +841,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) { IUnknown_Release(object->system_clock); strmbase_renderer_cleanup(&object->renderer); - CoTaskMemFree(object); + free(object); return hr; } @@ -852,7 +851,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) IDirectSound8_Release(object->dsound); IUnknown_Release(object->system_clock); strmbase_renderer_cleanup(&object->renderer); - CoTaskMemFree(object); + free(object); return hr; }

1 0

Alexandre Julliard : kernel32: Avoid using tolowerW/toupperW().
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 68587234bf82e268198f415a45256c854e179ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68587234bf82e268198f415a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:28:01 2020 +0200 kernel32: Avoid using tolowerW/toupperW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 11 +++++++++-- dlls/kernel32/editline.c | 16 +++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 48939c0287..656acb6b41 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -95,20 +95,25 @@ static LPCWSTR COMM_ParseParity(LPCWSTR ptr, LPBYTE lpparity) member of DCB and not fParity even when parity is specified in the device control string */ - switch(toupperW(*ptr++)) + switch(*ptr++) { + case 'e': case 'E': *lpparity = EVENPARITY; break; + case 'm': case 'M': *lpparity = MARKPARITY; break; + case 'n': case 'N': *lpparity = NOPARITY; break; + case 'o': case 'O': *lpparity = ODDPARITY; break; + case 's': case 'S': *lpparity = SPACEPARITY; break; @@ -239,7 +244,7 @@ static BOOL COMM_BuildOldCommDCB(LPCWSTR device, LPDCB lpdcb) { device++; while(*device == ' ') device++; - if(*device) last = toupperW(*device++); + if(*device) last = *device++; while(*device == ' ') device++; } @@ -255,6 +260,7 @@ static BOOL COMM_BuildOldCommDCB(LPCWSTR device, LPDCB lpdcb) lpdcb->fDtrControl = DTR_CONTROL_ENABLE; lpdcb->fRtsControl = RTS_CONTROL_ENABLE; break; + case 'x': case 'X': lpdcb->fInX = TRUE; lpdcb->fOutX = TRUE; @@ -263,6 +269,7 @@ static BOOL COMM_BuildOldCommDCB(LPCWSTR device, LPDCB lpdcb) lpdcb->fDtrControl = DTR_CONTROL_ENABLE; lpdcb->fRtsControl = RTS_CONTROL_ENABLE; break; + case 'p': case 'P': lpdcb->fInX = FALSE; lpdcb->fOutX = FALSE; diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 7492604f04..e3d52ccc1a 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wincon.h" +#include "winuser.h" #include "wine/unicode.h" #include "winnls.h" #include "wine/debug.h" @@ -598,9 +599,7 @@ static void WCEL_LowerCaseWord(WCEL_Context* ctx) unsigned int new_ofs = WCEL_GetRightWordTransition(ctx, ctx->ofs); if (new_ofs != ctx->ofs) { - unsigned int i; - for (i = ctx->ofs; i <= new_ofs; i++) - ctx->line[i] = tolowerW(ctx->line[i]); + CharLowerBuffW( ctx->line + ctx->ofs, new_ofs - ctx->ofs + 1 ); WCEL_Update(ctx, ctx->ofs, new_ofs - ctx->ofs + 1); ctx->ofs = new_ofs; } @@ -611,9 +610,7 @@ static void WCEL_UpperCaseWord(WCEL_Context* ctx) unsigned int new_ofs = WCEL_GetRightWordTransition(ctx, ctx->ofs); if (new_ofs != ctx->ofs) { - unsigned int i; - for (i = ctx->ofs; i <= new_ofs; i++) - ctx->line[i] = toupperW(ctx->line[i]); + CharUpperBuffW( ctx->line + ctx->ofs, new_ofs - ctx->ofs + 1 ); WCEL_Update(ctx, ctx->ofs, new_ofs - ctx->ofs + 1); ctx->ofs = new_ofs; } @@ -624,11 +621,8 @@ static void WCEL_CapitalizeWord(WCEL_Context* ctx) unsigned int new_ofs = WCEL_GetRightWordTransition(ctx, ctx->ofs); if (new_ofs != ctx->ofs) { - unsigned int i; - - ctx->line[ctx->ofs] = toupperW(ctx->line[ctx->ofs]); - for (i = ctx->ofs + 1; i <= new_ofs; i++) - ctx->line[i] = tolowerW(ctx->line[i]); + CharUpperBuffW( ctx->line + ctx->ofs, 1 ); + CharLowerBuffW( ctx->line + ctx->ofs + 1, new_ofs - ctx->ofs ); WCEL_Update(ctx, ctx->ofs, new_ofs - ctx->ofs + 1); ctx->ofs = new_ofs; }

1 0

Alexandre Julliard : kernel32: Avoid using memrchrW().
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: ce30db504bb61e026736ac0b24ce00ba587044de URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce30db504bb61e026736ac0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 10:28:57 2020 +0200 kernel32: Avoid using memrchrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index e4bd861b14..c7382fd7b3 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -418,8 +418,8 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) if (*szLineStart == '[') /* section start */ { - const WCHAR * szSectionEnd; - if (!(szSectionEnd = memrchrW( szLineStart, ']', szLineEnd - szLineStart ))) + for (len = szLineEnd - szLineStart; len > 0; len--) if (szLineStart[len - 1] == ']') break; + if (!len) { WARN("Invalid section header at line %d: %s\n", line, debugstr_wn(szLineStart, (int)(szLineEnd - szLineStart)) ); @@ -427,7 +427,7 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) else { szLineStart++; - len = (int)(szSectionEnd - szLineStart); + len -= 2; /* no need to allocate +1 for NULL terminating character as * already included in structure */ if (!(section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) + len * sizeof(WCHAR) )))

1 0

Alexandre Julliard : ntdll: Move support for getting LDT entries to the platform-specific files.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 6169cacd0d5b87459302d8dad278de3106bdbb6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6169cacd0d5b87459302d8da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:33:29 2020 +0200 ntdll: Move support for getting LDT entries to the platform-specific files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 47 +++++++++++++++++++++++++++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 8 +++++ dlls/ntdll/signal_arm64.c | 8 +++++ dlls/ntdll/signal_i386.c | 69 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/signal_powerpc.c | 8 +++++ dlls/ntdll/signal_x86_64.c | 8 +++++ dlls/ntdll/thread.c | 76 ++------------------------------------------ 8 files changed, 151 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6169cacd0d5b87459302…

1 0

Zebediah Figura : quartz/acmwrapper: Get rid of the ACMWrapperImpl typedef.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 1f1f417791d6d3684ef2289f25d59d8a67cd8efd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1f417791d6d3684ef2289f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:15 2020 -0500 quartz/acmwrapper: Get rid of the ACMWrapperImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b116f98ef0..6df04595bb 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct ACMWrapperImpl +struct acm_wrapper { struct strmbase_filter filter; CRITICAL_SECTION stream_cs; @@ -53,16 +53,16 @@ typedef struct ACMWrapperImpl LONGLONG lasttime_real; LONGLONG lasttime_sent; -} ACMWrapperImpl; +}; -static inline ACMWrapperImpl *impl_from_strmbase_filter(struct strmbase_filter *iface) +static struct acm_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, filter); + return CONTAINING_RECORD(iface, struct acm_wrapper, filter); } static HRESULT acm_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; @@ -80,7 +80,7 @@ static HRESULT acm_wrapper_sink_query_accept(struct strmbase_pin *iface, const A static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - ACMWrapperImpl *This = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *This = impl_from_strmbase_filter(iface->pin.filter); IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; LPBYTE pbDstStream; @@ -278,7 +278,7 @@ static BOOL is_audio_subtype(const GUID *guid) static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; MMRESULT res; @@ -312,7 +312,7 @@ static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, static void acm_wrapper_sink_disconnect(struct strmbase_sink *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); if (filter->has) acmStreamClose(filter->has, 0); @@ -332,7 +332,7 @@ static const struct strmbase_sink_ops sink_ops = static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(iid, &IID_IQualityControl)) *out = &filter->source_IQualityControl_iface; @@ -347,7 +347,7 @@ static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, RE static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) && (IsEqualGUID(&mt->subtype, &filter->mt.subtype) @@ -359,7 +359,7 @@ static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->filter); if (index) return VFW_S_NO_MORE_ITEMS; @@ -370,7 +370,7 @@ static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, static HRESULT WINAPI acm_wrapper_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) @@ -395,34 +395,34 @@ static const struct strmbase_source_ops source_ops = .pfnDecideBufferSize = acm_wrapper_source_DecideBufferSize, }; -static ACMWrapperImpl *impl_from_source_IQualityControl(IQualityControl *iface) +static struct acm_wrapper *impl_from_source_IQualityControl(IQualityControl *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, source_IQualityControl_iface); + return CONTAINING_RECORD(iface, struct acm_wrapper, source_IQualityControl_iface); } static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, REFIID iid, void **out) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); } static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_AddRef(&filter->source.pin.IPin_iface); } static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); return IPin_Release(&filter->source.pin.IPin_iface); } static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, IBaseFilter *sender, Quality q) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); IQualityControl *peer; HRESULT hr = S_OK; @@ -443,7 +443,7 @@ static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) { - ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + struct acm_wrapper *filter = impl_from_source_IQualityControl(iface); TRACE("filter %p, sink %p.\n", filter, sink); @@ -463,7 +463,7 @@ static const IQualityControlVtbl source_qc_vtbl = static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); if (index == 0) return &filter->sink.pin; @@ -474,7 +474,7 @@ static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, u static void acm_wrapper_destroy(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); if (filter->sink.pin.peer) IPin_Disconnect(filter->sink.pin.peer); @@ -499,7 +499,7 @@ static void acm_wrapper_destroy(struct strmbase_filter *iface) static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); BaseOutputPinImpl_Active(&filter->source); return S_OK; @@ -507,7 +507,7 @@ static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) static HRESULT acm_wrapper_cleanup_stream(struct strmbase_filter *iface) { - ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + struct acm_wrapper *filter = impl_from_strmbase_filter(iface); BaseOutputPinImpl_Inactive(&filter->source); return S_OK; @@ -523,7 +523,7 @@ static const struct strmbase_filter_ops filter_ops = HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) { - ACMWrapperImpl *object; + struct acm_wrapper *object; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Zebediah Figura : quartz/dsoundrender: Get rid of the DSoundRenderImpl typedef.
by Alexandre Julliard April 1, 2020

April 1, 2020

Module: wine Branch: master Commit: 5a5db91edde0a77febad12d12496c0a7356930d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a5db91edde0a77febad12d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 31 23:48:19 2020 -0500 quartz/dsoundrender: Get rid of the DSoundRenderImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 91 ++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a5db91edde0a77febad…

1 0