wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Jacek Caban : windef.h: Use __thiscall keyword on Clang with MSVC target.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 3acd943275d3293df2d5159eb4238e40c1d91645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acd943275d3293df2d5159e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 15:40:54 2020 +0200 windef.h: Use __thiscall keyword on Clang with MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windef.h | 2 +- include/wine/asm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 689163accc..436ac6afd8 100644 --- a/include/windef.h +++ b/include/windef.h @@ -102,7 +102,7 @@ extern "C" { # define __fastcall __stdcall #endif -#ifndef __thiscall +#if (!defined(_MSC_VER) || !defined(__clang__)) && !defined(__thiscall) # define __thiscall __stdcall #endif diff --git a/include/wine/asm.h b/include/wine/asm.h index 3f5a685bb6..a036744674 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -96,7 +96,7 @@ /* thiscall support */ -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) # ifdef _MSC_VER # define DEFINE_THISCALL_WRAPPER(func,args) \

1 0

Jacek Caban : include: Don't override keywords with macros on MSVC.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 1902eba2c611ac738a95ecab1f2495da4bb5dd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1902eba2c611ac738a95ecab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 15:40:44 2020 +0200 include: Don't override keywords with macros on MSVC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 8 ++------ include/windef.h | 32 +++++++++++++++----------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 3532cbf501..bc93de023f 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -49,7 +49,7 @@ #endif #endif -#ifndef __stdcall +#if !defined(_MSC_VER) && !defined(__stdcall) # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -57,8 +57,6 @@ # else # define __stdcall __attribute__((__stdcall__)) # endif -# elif defined(_MSC_VER) - /* Nothing needs to be done. __stdcall already exists */ # else # error You need to define __stdcall for your compiler # endif @@ -77,7 +75,7 @@ # endif /* __i386__ */ #endif /* __stdcall */ -#ifndef __cdecl +#if !defined(_MSC_VER) && !defined(__cdecl) # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) @@ -94,8 +92,6 @@ # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) -# elif !defined(_MSC_VER) -# define __cdecl # endif #endif /* __cdecl */ diff --git a/include/windef.h b/include/windef.h index 3c61cad4c5..689163accc 100644 --- a/include/windef.h +++ b/include/windef.h @@ -50,7 +50,7 @@ extern "C" { # endif #endif -#ifndef __stdcall +#if !defined(_MSC_VER) && !defined(__stdcall) # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -58,8 +58,6 @@ extern "C" { # else # define __stdcall __attribute__((__stdcall__)) # endif -# elif defined(_MSC_VER) - /* Nothing needs to be done. __stdcall already exists */ # else # error You need to define __stdcall for your compiler # endif @@ -78,7 +76,7 @@ extern "C" { # endif /* __i386__ */ #endif /* __stdcall */ -#ifndef __cdecl +#if !defined(_MSC_VER) && !defined(__cdecl) # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) @@ -100,10 +98,8 @@ extern "C" { # endif #endif /* __cdecl */ -#ifndef __fastcall -# ifndef _MSC_VER -# define __fastcall __stdcall -# endif +#if !defined(_MSC_VER) && !defined(__fastcall) +# define __fastcall __stdcall #endif #ifndef __thiscall @@ -140,12 +136,7 @@ extern "C" { #define __ONLY_IN_WINELIB(x) x #endif -#ifndef pascal -#define pascal __ONLY_IN_WINELIB(__stdcall) -#endif -#ifndef _pascal -#define _pascal __ONLY_IN_WINELIB(__stdcall) -#endif +#ifndef _MSC_VER #ifndef _stdcall #define _stdcall __ONLY_IN_WINELIB(__stdcall) #endif @@ -155,16 +146,23 @@ extern "C" { #ifndef __fastcall #define __fastcall __ONLY_IN_WINELIB(__stdcall) #endif -#ifndef __export -#define __export __ONLY_IN_WINELIB(__stdcall) -#endif #ifndef cdecl #define cdecl __ONLY_IN_WINELIB(__cdecl) #endif #ifndef _cdecl #define _cdecl __ONLY_IN_WINELIB(__cdecl) #endif +#endif /* _MSC_VER */ +#ifndef pascal +#define pascal __ONLY_IN_WINELIB(__stdcall) +#endif +#ifndef _pascal +#define _pascal __ONLY_IN_WINELIB(__stdcall) +#endif +#ifndef __export +#define __export __ONLY_IN_WINELIB(__stdcall) +#endif #ifndef near #define near __ONLY_IN_WINELIB(/* nothing */) #endif

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_GetFrameCount().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 79664eb1cf37d1e9b888941ea4f90dd220882a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79664eb1cf37d1e9b888941e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 23 17:29:49 2020 +0800 windowscodecs: Implement DdsDecoder_GetFrameCount(). The added tests code is to test the return value of DdsDecoder_GetFrameCount() when decoder is not initialized or parameter is NULL. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 40 ++++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 11 +++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 04914ead3a..19d5dd5a3f 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -94,6 +94,12 @@ typedef struct DdsDecoder { DDS_HEADER_DXT10 header_dxt10; } DdsDecoder; +static inline BOOL has_extended_header(DDS_HEADER *header) +{ + return (header->ddspf.flags & DDPF_FOURCC) && + (header->ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')); +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -202,8 +208,7 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } - if (This->header.ddspf.flags & DDPF_FOURCC && - This->header.ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')) { + if (has_extended_header(&This->header)) { hr = IStream_Read(pIStream, &This->header_dxt10, sizeof(This->header_dxt10), &bytesread); if (FAILED(hr)) goto end; if (bytesread != sizeof(This->header_dxt10)) { @@ -285,9 +290,36 @@ static HRESULT WINAPI DdsDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { - FIXME("(%p) <-- %d: stub.\n", iface, *pCount); + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + UINT arraySize = 1, mipMapCount = 1, depth = 1; + int i; - return E_NOTIMPL; + if (!pCount) return E_INVALIDARG; + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; + + EnterCriticalSection(&This->lock); + + if (This->header.mipMapCount) mipMapCount = This->header.mipMapCount; + if (This->header.depth) depth = This->header.depth; + if (has_extended_header(&This->header) && This->header_dxt10.arraySize) arraySize = This->header_dxt10.arraySize; + + if (depth == 1) { + *pCount = arraySize * mipMapCount; + } else { + *pCount = 0; + for (i = 0; i < mipMapCount; i++) + { + *pCount += depth; + if (depth > 1) depth /= 2; + } + *pCount *= arraySize; + } + + LeaveCriticalSection(&This->lock); + + TRACE("(%p) <-- %d\n", iface, *pCount); + + return S_OK; } static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 99f19eb175..e548ee9655 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -304,17 +304,22 @@ static void test_dds_decoder_frame_count(void) decoder = create_decoder(); if (!decoder) goto next; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok (hr == WINCODEC_ERR_WRONGSTATE, "%d: Expected hr=WINCODEC_ERR_WRONGSTATE, got %x\n", i, hr); + hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=E_INVALIDARG, got %x\n", i, hr); + hr = init_decoder(decoder, stream, S_OK, -1); if (hr != S_OK) goto next; - todo_wine { hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - ok (hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok (hr == S_OK, "%d: GetFrameCount failed, hr=%x\n", i, hr); if (hr == S_OK) { ok (frame_count == test_data[i].expected, "%d: expected frame count %d, got %d\n", i, test_data[i].expected, frame_count); } - }; + hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=S_OK, got %x\n", i, hr); next: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Nikolay Sivov : mf: Add missing IMFMediaEventGenerator query support for SAR stream.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 3b6699822ada81998610fbd9ccd6af98561c0356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6699822ada81998610fbd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 15:03:19 2020 +0300 mf: Add missing IMFMediaEventGenerator query support for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 1 + dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index bb3eba7eee..f883163bde 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1106,6 +1106,7 @@ static HRESULT WINAPI audio_renderer_stream_QueryInterface(IMFStreamSink *iface, TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFStreamSink) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *obj = &renderer->IMFStreamSink_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5b300cd90f..bf14ccf0fe 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2860,6 +2860,10 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); ok(hr == S_OK, "Failed to get a stream, hr %#x.\n", hr); + hr = IMFStreamSink_QueryInterface(stream_sink, &IID_IMFMediaEventGenerator, (void **)&unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFStreamSink_GetIdentifier(stream_sink, &id); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!id, "Unexpected id.\n");

1 0

Nikolay Sivov : mf: Add missing IMFMediaEventGenerator query support for sample grabber stream.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: c17994c21809303dbc98c1f71b11fbe26999f3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c17994c21809303dbc98c1f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 15:03:18 2020 +0300 mf: Add missing IMFMediaEventGenerator query support for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 1 + dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 1919ce6220..21f89c0ad0 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -141,6 +141,7 @@ static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFStreamSink) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *obj = &grabber->IMFStreamSink_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ae9f58a4bc..5b300cd90f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2028,6 +2028,10 @@ static void test_sample_grabber(void) hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + hr = IMFStreamSink_QueryInterface(stream, &IID_IMFMediaEventGenerator, (void **)&unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFStreamSink_GetIdentifier(stream, &id); ok(hr == S_OK, "Failed to get stream id, hr %#x.\n", hr); ok(id == 0, "Unexpected id %#x.\n", id);

1 0

Alexandre Julliard : opengl32: Add stub for wglGetDefaultProcAddress().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: c169bfb42829e4cc5d76be62a6eb407fdc2d003d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c169bfb42829e4cc5d76be62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:35:05 2020 +0200 opengl32: Add stub for wglGetDefaultProcAddress(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48898 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 6 ++++++ dlls/opengl32/opengl32.spec | 1 + dlls/opengl32/wgl.c | 9 +++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index cd04b34388..ebfd3c9161 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -381,6 +381,8 @@ my %remapped_wgl_functions = "wglUseFontOutlines" => 0, ); +my @extra_wgl_functions = ( "wglGetDefaultProcAddress" ); + my %supported_wgl_extensions = ( "WGL_ARB_create_context" => 1, @@ -502,6 +504,10 @@ sub parse_file($) } $wgl_functions{$name} = $functions{$cmd->{name}}; } + foreach my $name (@extra_wgl_functions) + { + $wgl_functions{$name} = $functions{$name} if defined $functions{$name}; + } } next unless defined $norm_categories{$feature->{name}}; foreach my $cmd ($feature->findnodes("./require/command")) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 4d4288cd48..94a3dfd075 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -344,6 +344,7 @@ @ stdcall wglDescribePixelFormat(long long long ptr) @ stdcall wglGetCurrentContext() @ stdcall wglGetCurrentDC() +@ stdcall wglGetDefaultProcAddress(str) @ stdcall wglGetLayerPaletteEntries(long long long long ptr) @ stdcall wglGetPixelFormat(long) @ stdcall wglGetProcAddress(str) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 008778c532..a1422fbfcd 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -949,6 +949,15 @@ int WINAPI wglSetLayerPaletteEntries(HDC hdc, return 0; } +/*********************************************************************** + * wglGetDefaultProcAddress (OPENGL32.@) + */ +PROC WINAPI wglGetDefaultProcAddress( LPCSTR name ) +{ + FIXME( "%s: stub\n", debugstr_a(name)); + return NULL; +} + /*********************************************************************** * wglSwapLayerBuffers (OPENGL32.@) */

1 0

Alexandre Julliard : opengl32: Make wgl driver entry points WINAPI.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: b0e2d046fc69cc4a4c5aefe383793950b44a1a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0e2d046fc69cc4a4c5aefe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:33:20 2020 +0200 opengl32: Make wgl driver entry points WINAPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 20 ++++++++++---------- dlls/opengl32/make_opengl | 14 +++++++------- dlls/opengl32/opengl_norm.c | 20 ++++++++++---------- dlls/wineandroid.drv/opengl.c | 20 ++++++++++---------- dlls/winemac.drv/opengl.c | 20 ++++++++++---------- dlls/winex11.drv/opengl.c | 22 +++++++++++----------- include/wine/wgl_driver.h | 22 +++++++++++----------- 7 files changed, 69 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0e2d046fc69cc4a4c5a…

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 60d7923682957f366abca8a75ac4b5510ecd6c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d7923682957f366abca8a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:31:51 2020 +0200 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 17 +++- dlls/opengl32/opengl_ext.c | 196 +++++++++++++++++++++++++++++++++++--------- dlls/opengl32/opengl_norm.c | 54 +++++++++--- include/wine/wgl.h | 51 ++++++++++-- include/wine/wgl_driver.h | 41 ++++++--- 5 files changed, 286 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60d7923682957f366abc…

1 0

Alexandre Julliard : opengl32: Specify the exact commit when fetching Khronos files.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 29839b7fd9e19b5624dd929ae16ba16d9f537f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29839b7fd9e19b5624dd929a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:27:44 2020 +0200 opengl32: Specify the exact commit when fetching Khronos files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f91796ee3a..b9f43d36ae 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -317,8 +317,11 @@ if ($version eq "1.0") { # # Fetch the registry files # --f "gl.xml" || system "wget https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/gl.xml" || die "cannot download gl.xml"; --f "wgl.xml" || system "wget https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/wgl.xml" || die "cannot download wgl.xml"; +my $url="https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry"; +my $commit="9929a7296ffdbd9c17125e1aa319cde78d1032e6"; + +-f "gl-$commit.xml" || system "wget", "-O", "gl-$commit.xml", "$url/$commit/xml/gl.xml" || die "cannot download gl.xml"; +-f "wgl-$commit.xml" || system "wget", "-O", "wgl-$commit.xml", "$url/$commit/xml/wgl.xml" || die "cannot download wgl.xml"; # @@ -559,8 +562,8 @@ sub parse_file($) } } -parse_file( "gl.xml" ); -parse_file( "wgl.xml" ); +parse_file( "gl-$commit.xml" ); +parse_file( "wgl-$commit.xml" ); parse_file( "winegl.xml" ); #

1 0

Serge Gautherie : winegcc: Reorder DECLSPEC_NORETURN on error().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 0939a3f7f23b8ed179e42df64e4ec5fde5b62658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0939a3f7f23b8ed179e42df6… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Apr 16 00:07:08 2020 +0200 winegcc: Reorder DECLSPEC_NORETURN on error(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 3d6b8f3665..cb4778fa09 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -52,7 +52,7 @@ enum target_platform PLATFORM_CYGWIN }; -void error(const char* s, ...) DECLSPEC_NORETURN; +void DECLSPEC_NORETURN error(const char* s, ...); void* xmalloc(size_t size); void* xrealloc(void* p, size_t size);

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