May 2019 - Wine-Commits - list.winehq.org

Daniel Lehman : advapi32: Implement EnumDynamicTimeZoneInformation.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 023ad350e20c91dbd86977fd84d33798de0f8009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=023ad350e20c91dbd86977fd… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue May 28 21:25:01 2019 -0700 advapi32: Implement EnumDynamicTimeZoneInformation. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 64 +++++++++ dlls/advapi32/tests/registry.c | 154 +++++++++++++++++++++ .../api-ms-win-core-timezone-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- include/Makefile.in | 1 + include/timezoneapi.h | 32 +++++ 7 files changed, 254 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=023ad350e20c91dbd869…

1 0

Zebediah Figura : widl: Use IsSimpleRef only for explicitly declared arrays.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 02976b655a5d9ad8ee25dbfb2051acb5b7431381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02976b655a5d9ad8ee25dbfb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:05 2019 -0500 widl: Use IsSimpleRef only for explicitly declared arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e5fb20c..9137712 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1064,9 +1064,16 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned case TGT_UNION: case TGT_USER_TYPE: case TGT_RANGE: + *flags |= MustFree; + if (!is_in && is_out) server_size = type_memsize( ref ); + break; case TGT_ARRAY: - *flags |= IsSimpleRef | MustFree; - *typestring_offset = ref->typestring_offset; + *flags |= MustFree; + if (!type_array_is_decl_as_ptr(ref)) + { + *flags |= IsSimpleRef; + *typestring_offset = ref->typestring_offset; + } if (!is_in && is_out) server_size = type_memsize( ref ); break; case TGT_STRING:

1 0

Zebediah Figura : newdev: Correct definition of DiInstallDriver().
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 1c1de06dfa5cbf776889bea4660c8944ce6f3ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c1de06dfa5cbf776889bea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 19:14:13 2019 -0500 newdev: Correct definition of DiInstallDriver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/newdev/main.c | 12 +++++------- dlls/newdev/newdev.spec | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 20725a4..b1a5ccf 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -25,7 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "setupapi.h" +#include "newdev.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -75,19 +75,17 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND hwndParent, LPCWSTR Hardware /*********************************************************************** * DiInstallDriverA (NEWDEV.@) */ -BOOL WINAPI DiInstallDriverA(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata, - PSP_DRVINFO_DATA_A driverdata, DWORD flags, BOOL *reboot) +BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOOL *reboot) { - FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot); + FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); return TRUE; } /*********************************************************************** * DiInstallDriverW (NEWDEV.@) */ -BOOL WINAPI DiInstallDriverW(HWND parent, HDEVINFO deviceinfo, PSP_DEVINFO_DATA devicedata, - PSP_DRVINFO_DATA_W driverdata, DWORD flags, BOOL *reboot) +BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BOOL *reboot) { - FIXME("Stub! %p %p %p %p 0x%08x %p\n", parent, deviceinfo, devicedata, driverdata, flags, reboot); + FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); return TRUE; } diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index 84303cc..6d45c7e 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,7 +1,7 @@ @ stub DeviceInternetSettingUiW @ stub DiInstallDevice -@ stdcall DiInstallDriverA(long ptr ptr ptr long ptr) -@ stdcall DiInstallDriverW(long ptr ptr ptr long ptr) +@ stdcall DiInstallDriverA(ptr str long ptr) +@ stdcall DiInstallDriverW(ptr wstr long ptr) @ stub DiRollbackDriver @ stub DiShowUpdateDevice @ stub DiUninstallDevice

1 0

Andrey Gusev : webservices: Fix misplaced parenthesis.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: d28412030a26ca1b281b1e88662ad3e7c6097eed URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28412030a26ca1b281b1e88… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 28 18:37:20 2019 +0300 webservices: Fix misplaced parenthesis. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 53448c1..b08eb87 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1112,7 +1112,7 @@ static HRESULT read_xmldecl( struct reader *reader ) HRESULT hr; if ((hr = read_more_data( reader, 1, NULL, NULL )) != S_OK) return hr; - if (*read_current_ptr( reader ) != '<' || (hr = read_cmp( reader, "<?", 2 ) != S_OK)) + if (*read_current_ptr( reader ) != '<' || (hr = read_cmp( reader, "<?", 2 )) != S_OK) { reader->state = READER_STATE_BOF; return S_OK;

1 0

Zebediah Figura : widl: Write array pointers as FC_OP pointers if appropriate.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 8e7fefe3d8c1104cb93d5ed7509b2462a3486a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7fefe3d8c1104cb93d5ed7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:08 2019 -0500 widl: Write array pointers as FC_OP pointers if appropriate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2c70d15..d47bee7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3607,8 +3607,7 @@ static unsigned int write_type_tfs(FILE *file, int indent, context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) { int ptr_type; - ptr_type = get_pointer_fc(type, attrs, - context == TYPE_CONTEXT_TOPLEVELPARAM); + ptr_type = get_pointer_fc_context(type, attrs, context); if (ptr_type != FC_RP || type_array_is_decl_as_ptr(type)) { unsigned int absoff = type->typestring_offset;

1 0

Andrey Gusev : oledb32: Remove duplicate WINAPI.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 68b09c2aa66bea46b209e480ff514912f910e6db URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b09c2aa66bea46b209e480… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 28 23:03:40 2019 +0300 oledb32: Remove duplicate WINAPI. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index f1c9cd1..6249167 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -219,13 +219,13 @@ static HRESULT WINAPI errorrec_QueryInterface(IErrorRecords *iface, REFIID riid, return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvObject); } -static ULONG WINAPI WINAPI errorrec_AddRef(IErrorRecords *iface) +static ULONG WINAPI errorrec_AddRef(IErrorRecords *iface) { errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_AddRef(&This->IErrorInfo_iface); } -static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface) +static ULONG WINAPI errorrec_Release(IErrorRecords *iface) { errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_Release(&This->IErrorInfo_iface);

1 0

Zebediah Figura : widl: Non-top-level conformant arrays are always [ref] by default.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: bb0e8059f01541049c4fcbbb5fc514946191c2db URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb0e8059f01541049c4fcbbb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:09 2019 -0500 widl: Non-top-level conformant arrays are always [ref] by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index dd676e9..5d91085 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1632,7 +1632,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl else *ptype = type_new_array((*ptype)->name, type_array_get_element(*ptype), FALSE, - 0, dim, NULL, 0); + 0, dim, NULL, FC_RP); } else if (is_ptr(*ptype)) *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE,

1 0

Zebediah Figura : widl: Remove an unused variable.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 55a0ec420f7ed92e7f53e391ab086cd35b815c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a0ec420f7ed92e7f53e391… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:07 2019 -0500 widl: Remove an unused variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c710df17..2c70d15 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2951,15 +2951,11 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int size; unsigned int start_offset; unsigned char fc; - int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); unsigned int baseoff = !type_array_is_decl_as_ptr(type) && current_structure ? type_memsize(current_structure) : 0; - if (!pointer_type) - pointer_type = FC_RP; - if (!is_string_type(attrs, type_array_get_element(type))) write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset);

1 0

Zebediah Figura : widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode.
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: 3c4d0bf4e3102c6fcff7acab189f874d6bd45003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c4d0bf4e3102c6fcff7acab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 00:24:06 2019 -0500 widl: Also allocate top-level pointers to arrays as on-stack in -Oicf mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47285 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9137712..c710df17 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2132,6 +2132,7 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs case TGT_POINTER: case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: + case TGT_ARRAY: flags |= FC_ALLOCED_ON_STACK; break; case TGT_IFACE_POINTER:

1 0

Zebediah Figura : qcap/avimux: Use BaseFilterImpl_Release().
by Alexandre Julliard May 29, 2019

May 29, 2019

Module: wine Branch: master Commit: e10cb0d29810eb5f03bda59ca39cc8304f2371bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10cb0d29810eb5f03bda59c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 28 23:10:19 2019 -0500 qcap/avimux: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 77e5898..3ca55ca 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -134,8 +134,30 @@ static IPin *avi_mux_get_pin(BaseFilter *iface, unsigned int index) return NULL; } +static void avi_mux_destroy(BaseFilter *iface) +{ + AviMux *filter = impl_from_BaseFilter(iface); + int i; + + BaseOutputPinImpl_Release(&filter->out->pin.pin.IPin_iface); + + for (i = 0; i < filter->input_pin_no; ++i) + { + IPin_Disconnect(&filter->in[i]->pin.pin.IPin_iface); + IMemAllocator_Release(filter->in[i]->samples_allocator); + filter->in[i]->samples_allocator = NULL; + BaseInputPinImpl_Release(&filter->in[i]->pin.pin.IPin_iface); + } + + heap_free(filter->idx1); + strmbase_filter_cleanup(&filter->filter); + heap_free(filter); + ObjectRefCount(FALSE); +} + static const BaseFilterFuncTable filter_func_table = { .filter_get_pin = avi_mux_get_pin, + .filter_destroy = avi_mux_destroy, }; static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) @@ -173,33 +195,6 @@ static HRESULT WINAPI AviMux_QueryInterface(IBaseFilter *iface, REFIID riid, voi return S_OK; } -static ULONG WINAPI AviMux_Release(IBaseFilter *iface) -{ - AviMux *This = impl_from_IBaseFilter(iface); - ULONG ref = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p) new refcount: %u\n", This, ref); - - if(!ref) { - int i; - - BaseOutputPinImpl_Release(&This->out->pin.pin.IPin_iface); - - for(i=0; i<This->input_pin_no; i++) { - IPin_Disconnect(&This->in[i]->pin.pin.IPin_iface); - IMemAllocator_Release(This->in[i]->samples_allocator); - This->in[i]->samples_allocator = NULL; - BaseInputPinImpl_Release(&This->in[i]->pin.pin.IPin_iface); - } - - HeapFree(GetProcessHeap(), 0, This->idx1); - strmbase_filter_cleanup(&This->filter); - HeapFree(GetProcessHeap(), 0, This); - ObjectRefCount(FALSE); - } - return ref; -} - static HRESULT out_flush(AviMux *This) { ULONG written; @@ -766,7 +761,7 @@ static HRESULT WINAPI AviMux_QueryVendorInfo(IBaseFilter *iface, LPWSTR *pVendor static const IBaseFilterVtbl AviMuxVtbl = { AviMux_QueryInterface, BaseFilterImpl_AddRef, - AviMux_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, AviMux_Stop, AviMux_Pause,

1 0