wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Dmitry Kislyuk : wshom.ocx: Use wide character string literals.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 7d0c23f60ef4382eb89cd2facd99b8bcec0530cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d0c23f60ef4382eb89cd2fa… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Sat Apr 25 23:10:36 2020 -0500 wshom.ocx: Use wide character string literals. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 543d951ea0..f05ce31ee9 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -637,9 +637,6 @@ static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdM static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, VARIANT *value) { WshCollection *This = impl_from_IWshCollection(iface); - static const WCHAR allusersdesktopW[] = {'A','l','l','U','s','e','r','s','D','e','s','k','t','o','p',0}; - static const WCHAR allusersprogramsW[] = {'A','l','l','U','s','e','r','s','P','r','o','g','r','a','m','s',0}; - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; PIDLIST_ABSOLUTE pidl; WCHAR pathW[MAX_PATH]; int kind = 0; @@ -655,11 +652,11 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, } folder = V_BSTR(index); - if (!wcsicmp(folder, desktopW)) + if (!wcsicmp(folder, L"Desktop")) kind = CSIDL_DESKTOP; - else if (!wcsicmp(folder, allusersdesktopW)) + else if (!wcsicmp(folder, L"AllUsersDesktop")) kind = CSIDL_COMMON_DESKTOPDIRECTORY; - else if (!wcsicmp(folder, allusersprogramsW)) + else if (!wcsicmp(folder, L"AllUsersPrograms")) kind = CSIDL_COMMON_PROGRAMS; else { @@ -908,7 +905,6 @@ static HRESULT WINAPI WshShortcut_put_Hotkey(IWshShortcut *iface, BSTR Hotkey) static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *IconPath) { - static const WCHAR fmtW[] = {'%','s',',',' ','%','d',0}; WshShortcut *This = impl_from_IWshShortcut(iface); WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; INT icon = 0; @@ -922,7 +918,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; - swprintf(pathW, ARRAY_SIZE(pathW), fmtW, buffW, icon); + swprintf(pathW, ARRAY_SIZE(pathW), L"%s, %d", buffW, icon); *IconPath = SysAllocString(pathW); if (!*IconPath) return E_OUTOFMEMORY; @@ -1318,11 +1314,10 @@ struct popup_thread_param static DWORD WINAPI popup_thread_proc(void *arg) { - static const WCHAR defaulttitleW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; struct popup_thread_param *param = (struct popup_thread_param *)arg; param->button = MessageBoxW(NULL, param->text, is_optional_argument(&param->title) ? - defaulttitleW : V_BSTR(&param->title), V_I4(&param->type)); + L"Windows Script Host" : V_BSTR(&param->title), V_I4(&param->type)); return 0; } @@ -1420,11 +1415,11 @@ static HKEY get_root_key(const WCHAR *path) const WCHAR abbrev[5]; HKEY hkey; } rootkeys[] = { - { {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, {'H','K','C','U',0}, HKEY_CURRENT_USER }, - { {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, {'H','K','L','M',0}, HKEY_LOCAL_MACHINE }, - { {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, {'H','K','C','R',0}, HKEY_CLASSES_ROOT }, - { {'H','K','E','Y','_','U','S','E','R','S',0}, {0}, HKEY_USERS }, - { {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}, {0}, HKEY_CURRENT_CONFIG } + { L"HKEY_CURRENT_USER", L"HKCU", HKEY_CURRENT_USER }, + { L"HKEY_LOCAL_MACHINE", L"HKLM", HKEY_LOCAL_MACHINE }, + { L"HKEY_CLASSES_ROOT", L"HKCR", HKEY_CLASSES_ROOT }, + { L"HKEY_USERS", {0}, HKEY_USERS }, + { L"HKEY_CURRENT_CONFIG", {0}, HKEY_CURRENT_CONFIG } }; int i; @@ -1612,11 +1607,6 @@ fail: static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT *value, VARIANT *type) { - static const WCHAR regexpandszW[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; - static const WCHAR regszW[] = {'R','E','G','_','S','Z',0}; - static const WCHAR regdwordW[] = {'R','E','G','_','D','W','O','R','D',0}; - static const WCHAR regbinaryW[] = {'R','E','G','_','B','I','N','A','R','Y',0}; - DWORD regtype, data_len; WCHAR *subkey, *val; const BYTE *data; @@ -1641,13 +1631,13 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * if (V_VT(type) != VT_BSTR) return E_INVALIDARG; - if (!wcscmp(V_BSTR(type), regszW)) + if (!wcscmp(V_BSTR(type), L"REG_SZ")) regtype = REG_SZ; - else if (!wcscmp(V_BSTR(type), regdwordW)) + else if (!wcscmp(V_BSTR(type), L"REG_DWORD")) regtype = REG_DWORD; - else if (!wcscmp(V_BSTR(type), regexpandszW)) + else if (!wcscmp(V_BSTR(type), L"REG_EXPAND_SZ")) regtype = REG_EXPAND_SZ; - else if (!wcscmp(V_BSTR(type), regbinaryW)) + else if (!wcscmp(V_BSTR(type), L"REG_BINARY")) regtype = REG_BINARY; else { FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type)));

1 0

Zebediah Figura : advapi32: Move event tracing APIs to sechost.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: aa6e060172532e407796fba9219a3ae678150ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6e060172532e407796fba9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 15:40:24 2020 -0500 advapi32: Move event tracing APIs to sechost. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 2 +- dlls/advapi32/advapi32.spec | 24 +++---- dlls/advapi32/eventlog.c | 142 ---------------------------------------- dlls/sechost/Makefile.in | 5 ++ dlls/sechost/sechost.spec | 24 +++---- dlls/sechost/trace.c | 155 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 185 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa6e060172532e407796…

1 0

Zebediah Figura : quartz/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 7de86140f1888cc87459c1b48e911671051ab46f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de86140f1888cc87459c1b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:19 2020 -0500 quartz/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 7 ------- dlls/quartz/tests/avisplit.c | 7 ------- dlls/quartz/tests/filesource.c | 6 ------ dlls/quartz/tests/mpegsplit.c | 7 ------- dlls/quartz/tests/videorenderer.c | 7 ------- dlls/quartz/tests/vmr7.c | 7 ------- dlls/quartz/tests/vmr9.c | 7 ------- 7 files changed, 48 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 7b38561c01..0e1e92a950 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -769,11 +769,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -782,8 +777,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 319c7a5ccd..a277256255 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -836,11 +836,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -877,8 +872,6 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = testsource_AttemptConnection, }; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 2040910516..b50b06dc10 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1240,11 +1240,6 @@ static const struct strmbase_filter_ops testsink_ops = .filter_destroy = testsink_destroy, }; -static HRESULT testsink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { struct testsink *filter = impl_sink_from_strmbase_filter(iface->filter); @@ -1274,7 +1269,6 @@ static void testsink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops testsink_pin_ops = { - .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, .sink_disconnect = testsink_disconnect, diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index c8b368e4b6..9bfd7e3bb1 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1126,11 +1126,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { struct testfilter *filter = impl_from_strmbase_filter(iface->filter); @@ -1167,8 +1162,6 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface static const struct strmbase_source_ops testsource_ops = { .base.pin_query_interface = testsource_query_interface, - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = testsource_AttemptConnection, }; diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 356cfe96e4..3722a6f9dd 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -517,11 +517,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -530,8 +525,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 19a89de573..f4b26db554 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -867,11 +867,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -880,8 +875,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3e9fccedf1..35776e85ff 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -876,11 +876,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -889,8 +884,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };

1 0

Zebediah Figura : winegstreamer: Remove some no longer necessary callbacks.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 1a4e9a84c252f754f3577e6f56f6831fb03d5aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4e9a84c252f754f3577e6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:18 2020 -0500 winegstreamer: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2186192b59..7038cef9b3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1568,7 +1568,6 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2298,7 +2297,6 @@ static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const A static const struct strmbase_sink_ops wave_parser_sink_ops = { .base.pin_query_accept = wave_parser_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2415,7 +2413,6 @@ static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const static const struct strmbase_sink_ops avi_splitter_sink_ops = { .base.pin_query_accept = avi_splitter_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, }; @@ -2536,7 +2533,6 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { .base.pin_query_accept = mpeg_splitter_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = gstdemux_sink_connect, .sink_disconnect = gstdemux_sink_disconnect, };

1 0

Zebediah Figura : qasf/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 9ec02ddeb435553c653d751474ee975fd21f7275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec02ddeb435553c653d7514… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:17 2020 -0500 qasf/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index a456891a38..72c05ee49c 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1153,11 +1153,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *input, IMemAllocator **allocator) { @@ -1166,8 +1161,6 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };

1 0

Zebediah Figura : wineqtdecoder: Remove some no longer necessary callbacks.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 45f2f1796bd7ec5d28bb4bc00491c25a9890c90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f2f1796bd7ec5d28bb4bc0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:16 2020 -0500 wineqtdecoder: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 1 - dlls/wineqtdecoder/qtvdecoder.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index f52971f3f7..cabb090e8d 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -397,7 +397,6 @@ static void qt_splitter_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .sink_connect = qt_splitter_sink_connect, .sink_disconnect = qt_splitter_sink_disconnect, }; diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 41b29786cc..031b08e1de 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -168,11 +168,6 @@ static HRESULT video_decoder_sink_query_interface(struct strmbase_pin *iface, RE return S_OK; } -static HRESULT video_decoder_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static void trackingCallback( void *decompressionTrackingRefCon, OSStatus result, @@ -462,8 +457,6 @@ static void video_decoder_sink_disconnect(struct strmbase_sink *iface) static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = video_decoder_sink_query_interface, - .base.pin_query_accept = video_decoder_sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = video_decoder_sink_Receive, .sink_connect = video_decoder_sink_connect, .sink_disconnect = video_decoder_sink_disconnect,

1 0

Zebediah Figura : amstream/tests: Remove some no longer necessary callbacks.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: dab1b7e7589ceb0726932c80acabad86ab9938b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dab1b7e7589ceb0726932c80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 24 15:27:15 2020 -0500 amstream/tests: Remove some no longer necessary callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 4b7320500c..073e372c94 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2394,11 +2394,6 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_cleanup_stream = testfilter_cleanup_stream, }; -static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) -{ - return S_OK; -} - static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *requested) { @@ -2418,8 +2413,6 @@ static HRESULT WINAPI testsource_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { - .base.pin_query_accept = testsource_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = testsource_DecideBufferSize, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,

1 0

Rémi Bernon : server: Make sure pids/tids are multiples of four.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: daa120309e1f674a251497ff6a014168d339c90c URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa120309e1f674a251497ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 25 10:05:10 2020 +0200 server: Make sure pids/tids are multiples of four. Street Fighter V unpacker relies on it when validating other processes for its anti-debug checks, it uses (PID&0xfffffffc)>>2 as an array index and then checks back indexes against PIDs, and terminates early if some PIDs do not match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ---- server/process.c | 31 ++++++++++++++++++------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1576f5ca97..e28eefa986 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -409,7 +409,6 @@ static void test_query_process(void) DWORD_PTR tid; DWORD j; - todo_wine_if(last_pid & 3) ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for ( j = 0; j < spi->dwThreadCount; j++) { @@ -419,7 +418,6 @@ static void test_query_process(void) spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; - todo_wine_if(tid & 3) ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } } @@ -450,7 +448,6 @@ static void test_query_process(void) cid.UniqueThread = 0; status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine_if( status != STATUS_SUCCESS ) ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, "NtOpenProcess returned:%x\n", status ); if (status != STATUS_SUCCESS) continue; @@ -470,7 +467,6 @@ static void test_query_process(void) cid.UniqueThread = ULongToHandle(GetCurrentThreadId() + i); status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid ); - todo_wine_if( status != STATUS_SUCCESS ) ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, "NtOpenThread returned:%x\n", status ); if (status != STATUS_SUCCESS) continue; diff --git a/server/process.c b/server/process.c index 73984f363f..211207ed03 100644 --- a/server/process.c +++ b/server/process.c @@ -339,21 +339,24 @@ static void kill_all_processes(void); #define PTID_OFFSET 8 /* offset for first ptid value */ +static unsigned int index_from_ptid(unsigned int id) { return id / 4; } +static unsigned int ptid_from_index(unsigned int index) { return index * 4; } + /* allocate a new process or thread id */ unsigned int alloc_ptid( void *ptr ) { struct ptid_entry *entry; - unsigned int id; + unsigned int index; if (used_ptid_entries < alloc_ptid_entries) { - id = used_ptid_entries + PTID_OFFSET; + index = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } else if (next_free_ptid && num_free_ptids >= 256) { - id = next_free_ptid; - entry = &ptid_entries[id - PTID_OFFSET]; + index = next_free_ptid; + entry = &ptid_entries[index - PTID_OFFSET]; if (!(next_free_ptid = entry->next)) last_free_ptid = 0; num_free_ptids--; } @@ -368,35 +371,37 @@ unsigned int alloc_ptid( void *ptr ) } ptid_entries = entry; alloc_ptid_entries = count; - id = used_ptid_entries + PTID_OFFSET; + index = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } entry->ptr = ptr; - return id; + return ptid_from_index( index ); } /* free a process or thread id */ void free_ptid( unsigned int id ) { - struct ptid_entry *entry = &ptid_entries[id - PTID_OFFSET]; + unsigned int index = index_from_ptid( id ); + struct ptid_entry *entry = &ptid_entries[index - PTID_OFFSET]; entry->ptr = NULL; entry->next = 0; /* append to end of free list so that we don't reuse it too early */ - if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; - else next_free_ptid = id; - last_free_ptid = id; + if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = index; + else next_free_ptid = index; + last_free_ptid = index; num_free_ptids++; } /* retrieve the pointer corresponding to a process or thread id */ void *get_ptid_entry( unsigned int id ) { - if (id < PTID_OFFSET) return NULL; - if (id - PTID_OFFSET >= used_ptid_entries) return NULL; - return ptid_entries[id - PTID_OFFSET].ptr; + unsigned int index = index_from_ptid( id ); + if (index < PTID_OFFSET) return NULL; + if (index - PTID_OFFSET >= used_ptid_entries) return NULL; + return ptid_entries[index - PTID_OFFSET].ptr; } /* return the main thread of the process */

1 0

Rémi Bernon : ntdll/tests: Test that ptids are multiples of four.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 8bb684c63e02cabde0908b9b22d0bad3f044b214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bb684c63e02cabde0908b9b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 25 10:05:08 2020 +0200 ntdll/tests: Test that ptids are multiples of four. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8dc8bad645..1576f5ca97 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -319,6 +319,11 @@ static void test_query_process(void) int i = 0, k = 0; BOOL is_nt = FALSE; SYSTEM_BASIC_INFORMATION sbi; + PROCESS_BASIC_INFORMATION pbi; + THREAD_BASIC_INFORMATION tbi; + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + HANDLE handle; /* Copy of our winternl.h structure turned into a private one */ typedef struct _SYSTEM_PROCESS_INFORMATION_PRIVATE { @@ -401,13 +406,21 @@ static void test_query_process(void) if (!is_nt) { + DWORD_PTR tid; DWORD j; + + todo_wine_if(last_pid & 3) + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for ( j = 0; j < spi->dwThreadCount; j++) { k++; ok ( spi->ti[j].ClientId.UniqueProcess == spi->UniqueProcessId, "The owning pid of the thread (%p) doesn't equal the pid (%p) of the process\n", spi->ti[j].ClientId.UniqueProcess, spi->UniqueProcessId); + + tid = (DWORD_PTR)spi->ti[j].ClientId.UniqueThread; + todo_wine_if(tid & 3) + ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } } @@ -423,6 +436,52 @@ static void test_query_process(void) if (one_before_last_pid == 0) one_before_last_pid = last_pid; HeapFree( GetProcessHeap(), 0, spi_buf); + + if (is_nt) + { + win_skip("skipping ptids low bits tests\n"); + return; + } + + for (i = 1; i < 4; ++i) + { + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = ULongToHandle(GetCurrentProcessId() + i); + cid.UniqueThread = 0; + + status = NtOpenProcess( &handle, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine_if( status != STATUS_SUCCESS ) + ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, + "NtOpenProcess returned:%x\n", status ); + if (status != STATUS_SUCCESS) continue; + + status = pNtQueryInformationProcess( handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); + ok( status == STATUS_SUCCESS, "NtQueryInformationProcess returned:%x\n", status ); + ok( pbi.UniqueProcessId == GetCurrentProcessId(), + "Expected pid %p, got %p\n", ULongToHandle(GetCurrentProcessId()), ULongToHandle(pbi.UniqueProcessId) ); + + NtClose( handle ); + } + + for (i = 1; i < 4; ++i) + { + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = 0; + cid.UniqueThread = ULongToHandle(GetCurrentThreadId() + i); + + status = NtOpenThread( &handle, THREAD_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine_if( status != STATUS_SUCCESS ) + ok( status == STATUS_SUCCESS || broken( status == STATUS_ACCESS_DENIED ) /* wxppro */, + "NtOpenThread returned:%x\n", status ); + if (status != STATUS_SUCCESS) continue; + + status = pNtQueryInformationThread( handle, ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); + ok( status == STATUS_SUCCESS, "NtQueryInformationThread returned:%x\n", status ); + ok( tbi.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), + "Expected tid %p, got %p\n", ULongToHandle(GetCurrentThreadId()), tbi.ClientId.UniqueThread ); + + NtClose( handle ); + } } static void test_query_procperf(void)

1 0

Jacek Caban : msvcp: Get rid of no longer needed hack.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 1cc92377a16fb1316cd3d7d28a84c11485c67981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc92377a16fb1316cd3d7d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 20:15:11 2020 +0200 msvcp: Get rid of no longer needed hack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 816a95c29e..e33fc6434f 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -225,8 +225,3 @@ __int64 * __cdecl std_Fpz_func(void) { return &std_Fpz; } - -#if defined(__MINGW32__) && _MSVCP_VER >= 80 && _MSVCP_VER <= 90 -/* Hack: prevent Mingw from importing mingw_helpers.o which conflicts with encode/decode_pointer */ -int mingw_app_type = 0; -#endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020