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

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 : 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 : 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 : 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

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

Jacek Caban : wine/exception.h: Don't override __attribute__ keyword on clang MSVC target.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 59336f2ff2a36003e2b4bdc3dfe7e35ca012e7a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59336f2ff2a36003e2b4bdc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 01:18:50 2020 +0200 wine/exception.h: Don't override __attribute__ keyword on clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/exception.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 4bf4c7e6d9..a6ada7af21 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -70,7 +70,7 @@ extern "C" { * -- AJ */ -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(__clang__) #define __attribute__(x) /* nothing */ #endif

1 0

Jacek Caban : wincon.h: Don't use calling convention wrappers on MSVC.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: b7ce75e9896a38af5579524adaba8b9952d60221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ce75e9896a38af5579524a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 01:19:00 2020 +0200 wincon.h: Don't use calling convention wrappers on MSVC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- dlls/kernelbase/console.c | 2 +- include/wincon.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 472d513990..99734cedf6 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1802,7 +1802,7 @@ static COORD get_console_font_size(HANDLE hConsole, DWORD index) return c; } -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) #undef GetConsoleFontSize DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) { diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 347f1d2a63..7dabc91e67 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -577,7 +577,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) /*********************************************************************** * GetLargestConsoleWindowSize (kernelbase.@) */ -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) #undef GetLargestConsoleWindowSize DWORD WINAPI DECLSPEC_HOTPATCH GetLargestConsoleWindowSize( HANDLE handle ) { diff --git a/include/wincon.h b/include/wincon.h index ececc66220..9f4ccced11 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -268,7 +268,7 @@ typedef struct tagINPUT_RECORD #define CONSOLE_TEXTMODE_BUFFER 1 -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) /* Note: this should return a COORD, but calling convention for returning * structures is different between Windows and gcc on i386. */

1 0

Jacek Caban : include: Improve _CrtDbgBreak macro.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: b00a6e6e304f9535f4c88cd23b627d2108cd7cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00a6e6e304f9535f4c88cd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 04:25:22 2020 +0200 include: Improve _CrtDbgBreak macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdbg.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/crtdbg.h b/include/msvcrt/crtdbg.h index 2a75dfd57e..6a7dab0185 100644 --- a/include/msvcrt/crtdbg.h +++ b/include/msvcrt/crtdbg.h @@ -70,7 +70,9 @@ typedef struct _CrtMemState #include <assert.h> #define _ASSERT(expr) assert(expr) #define _ASSERTE(expr) assert(expr) -#if defined(__GNUC__) && defined(__i386__) +#if defined(_MSC_VER) +#define _CrtDbgBreak() __debugbreak() +#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) #define _CrtDbgBreak() __asm__ ("\tint $0x3\n") #else #define _CrtDbgBreak() ((void)0)

1 0

Jacek Caban : math.h: Use builtin nan and inf on clang MSVC target.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: 8941d8e0363167b0eb555b215d8b96e4a1add98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8941d8e0363167b0eb555b21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 01:19:28 2020 +0200 math.h: Use builtin nan and inf on clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 76601de853..01c4a4b61b 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -205,7 +205,7 @@ static const union { # endif #endif -#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +#if (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))) || defined(__clang__) # define INFINITY __builtin_inff() # define NAN __builtin_nanf("") #else

1 0

Zebediah Figura : sechost: New stub DLL.
by Alexandre Julliard 27 Apr '20

27 Apr '20

Module: wine Branch: master Commit: dedd5ccc88547529ffb1101045602aed59fa0170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dedd5ccc88547529ffb11010… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 25 15:40:23 2020 -0500 sechost: New stub DLL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/sechost/Makefile.in | 3 + dlls/sechost/sechost.spec | 208 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 215 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dedd5ccc88547529ffb1…

1 0