winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
874 discussions
Start a n
N
ew thread
Nikolay Sivov : gdi32/tests: Reduce some tracing noise in font tests.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: 0f51b732e4eae54b13232e025d00f277d75f564b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0f51b732e4eae54b13232e02…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 26 18:45:23 2020 +0300 gdi32/tests: Reduce some tracing noise in font tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 101 +++++++++--------------------------------------- 1 file changed, 18 insertions(+), 83 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f51b732e4eae54b1323…
1
0
0
0
Nikolay Sivov : mf/tests: Add some tests for SAR time source.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: f2465d92b80c07b9452a97e8bdbddb1d36514af6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f2465d92b80c07b9452a97e8…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 26 18:05:39 2020 +0300 mf/tests: Add some tests for SAR time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a1a7d2b05a..8f3a80360f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2555,7 +2555,11 @@ static void test_quality_manager(void) static void test_sar(void) { IMFPresentationTimeSource *time_source; + IMFClockStateSink *state_sink; + MFCLOCK_STATE state; IMFMediaSink *sink; + IMFClock *clock; + DWORD flags; HRESULT hr; hr = CoInitialize(NULL); @@ -2576,6 +2580,26 @@ if (SUCCEEDED(hr)) { hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetUnderlyingClock(time_source, &clock); + ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetClockCharacteristics(time_source, &flags); + ok(hr == S_OK, "Failed to get flags, hr %#x.\n", hr); + ok(flags == MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ, "Unexpected flags %#x.\n", flags); + + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink); + ok(hr == S_OK, "Failed to get state sink, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + IMFClockStateSink_Release(state_sink); + IMFPresentationTimeSource_Release(time_source); IMFMediaSink_Release(sink);
1
0
0
0
Zebediah Figura : ddraw: Avoid leaking the primary stateblock.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: 2d22647506c99300954f54d2c902355d7a39a899 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=2d22647506c99300954f54d2…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:08 2020 -0600 ddraw: Avoid leaking the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 03b03f4584..7fd78e6234 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -245,6 +245,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) wined3d_device_set_rendertarget_view(This->wined3d_device, 0, NULL, FALSE); + wined3d_stateblock_decref(This->state); if (This->recording) wined3d_stateblock_decref(This->recording);
1
0
0
0
Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetLight() and d3d8_device_LightEnable().
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: 6384f4c4e74e47d2aab3ab9f5758142acca278c8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6384f4c4e74e47d2aab3ab9f…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:07 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetLight() and d3d8_device_LightEnable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 81361a90eb..869a6a2dd0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1754,8 +1754,6 @@ static HRESULT WINAPI d3d8_device_SetLight(IDirect3DDevice8 *iface, DWORD index, /* Note: D3DLIGHT8 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); hr = wined3d_stateblock_set_light(device->update_state, index, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, index, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr; @@ -1786,8 +1784,6 @@ static HRESULT WINAPI d3d8_device_LightEnable(IDirect3DDevice8 *iface, DWORD ind wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;
1
0
0
0
Zebediah Figura : d3d8: Retrieve light state from the primary stateblock.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: f7d744e9c581c62321bc70ae0a279ddc07ce7ab7 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f7d744e9c581c62321bc70ae…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:06 2020 -0600 d3d8: Retrieve light state from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 79d41afebf..81361a90eb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1764,13 +1764,14 @@ static HRESULT WINAPI d3d8_device_SetLight(IDirect3DDevice8 *iface, DWORD index, static HRESULT WINAPI d3d8_device_GetLight(IDirect3DDevice8 *iface, DWORD index, D3DLIGHT8 *light) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + BOOL enabled; HRESULT hr; TRACE("iface %p, index %u, light %p.\n", iface, index, light); /* Note: D3DLIGHT8 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); - hr = wined3d_device_get_light(device->wined3d_device, index, (struct wined3d_light *)light); + hr = wined3d_stateblock_get_light(device->state, index, (struct wined3d_light *)light, &enabled); wined3d_mutex_unlock(); return hr; @@ -1792,15 +1793,16 @@ static HRESULT WINAPI d3d8_device_LightEnable(IDirect3DDevice8 *iface, DWORD ind return hr; } -static HRESULT WINAPI d3d8_device_GetLightEnable(IDirect3DDevice8 *iface, DWORD index, BOOL *enable) +static HRESULT WINAPI d3d8_device_GetLightEnable(IDirect3DDevice8 *iface, DWORD index, BOOL *enabled) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_light light; HRESULT hr; - TRACE("iface %p, index %u, enable %p.\n", iface, index, enable); + TRACE("iface %p, index %u, enabled %p.\n", iface, index, enabled); wined3d_mutex_lock(); - hr = wined3d_device_get_light_enable(device->wined3d_device, index, enable); + hr = wined3d_stateblock_get_light(device->state, index, &light, enabled); wined3d_mutex_unlock(); return hr;
1
0
0
0
Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetViewport().
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: 7e0e1859d13a323d4f9f0c6e6ea54a3fa583b248 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7e0e1859d13a323d4f9f0c6e…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:05 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7853aa9b55..79d41afebf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1690,8 +1690,6 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.max_z = viewport->MaxZ; wined3d_stateblock_set_viewport(device->update_state, &vp); - if (!device->recording) - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;
1
0
0
0
Zebediah Figura : d3d8: Retrieve the viewport from the primary stateblock.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: 3fa7bd141af550a25469f24b30d5492d3849ddc9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3fa7bd141af550a25469f24b…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:04 2020 -0600 d3d8: Retrieve the viewport from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e7c79d54a0..7853aa9b55 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1705,7 +1705,7 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x;
1
0
0
0
Alistair Leslie-Hughes : dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: 79b91eaf28f449ce0d03dde1130cb238e064f093 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=79b91eaf28f449ce0d03dde1…
Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 26 04:19:29 2020 +0000 dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=48648
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 3e480028b9..5a97dac079 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -151,11 +151,17 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, - IDirectMusicBand **ppBand) + IDirectMusicBand **band) { - IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p): stub\n", This, ppBand); - return S_OK; + IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); + FIXME("(%p, %p): stub\n", This, band); + + if (!band) + return E_POINTER; + + *band = NULL; + + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index,
1
0
0
0
Jacek Caban : include: Make sys/stat.h compatible with ucrt.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: e2a0a99e14d7514c5f1d5ffd52731d9a9cba7b47 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e2a0a99e14d7514c5f1d5ffd…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:51 2020 +0100 include: Make sys/stat.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/sys/stat.h | 56 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 15cf823739..5a2fa9b1fc 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -106,9 +106,9 @@ struct _stat32i64 { short st_gid; _dev_t st_rdev; __int64 DECLSPEC_ALIGN(8) st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; + __time32_t st_atime; + __time32_t st_mtime; + __time32_t st_ctime; }; struct _stat64i32 { @@ -158,19 +158,53 @@ struct _stat64 { extern "C" { #endif -int __cdecl _fstat(int,struct _stat*); -int __cdecl _stat(const char*,struct _stat*); +#ifdef _UCRT +# ifdef _USE_32BIT_TIME_T +# define _fstat _fstat32 +# define _fstati64 _fstat32i64 +# define _stat _stat32 +# define _stati64 _stat32i64 +# define _wstat _wstat32 +# define _wstati64 _wstat32i64 +# else +# define _fstat _fstat64i32 +# define _fstati64 _fstat64 +# define _stat _stat64i32 +# define _stati64 _stat64 +# define _wstat _wstat64i32 +# define _wstati64 _wstat64 +# endif +#else /* _UCRT */ +# ifdef _USE_32BIT_TIME_T +# define _fstat32 _fstat +# define _fstat32i64 _fstati64 +# define _stat32i64 _stati64 +# define _stat32 _stat +# define _wstat32 _wstat +# define _wstat32i64 _wstati64 +# else +# define _fstat64i32 _fstat +# define _fstat64 _fstati64 +# define _stat64 _stati64 +# define _stat64i32 _stat +# define _wstat64i32 _wstat +# define _wstat64 _wstati64 +# endif +#endif + int __cdecl _fstat32(int, struct _stat32*); -int __cdecl _stat32(const char*, struct _stat32*); -int __cdecl _fstati64(int,struct _stati64*); -int __cdecl _stati64(const char*,struct _stati64*); +int __cdecl _fstat32i64(int, struct _stat32i64*); int __cdecl _fstat64(int,struct _stat64*); +int __cdecl _fstat64i32(int,struct _stat64i32*); +int __cdecl _stat32(const char*, struct _stat32*); +int __cdecl _stat32i64(const char*, struct _stat32i64*); int __cdecl _stat64(const char*,struct _stat64*); +int __cdecl _stat64i32(const char*,struct _stat64i32*); int __cdecl _umask(int); -int __cdecl _wstat(const wchar_t*,struct _stat*); -int __cdecl _wstat32(const wchar_t*, struct _stat32*); -int __cdecl _wstati64(const wchar_t*,struct _stati64*); +int __cdecl _wstat32(const wchar_t*,struct _stat32*); +int __cdecl _wstat32i64(const wchar_t*, struct _stat32i64*); int __cdecl _wstat64(const wchar_t*,struct _stat64*); +int __cdecl _wstat64i32(const wchar_t*,struct _stat64i32*); #ifdef __cplusplus }
1
0
0
0
Jacek Caban : include: Make corecrt_wio.h compatible with ucrt.
by Alexandre Julliard
26 Feb '20
26 Feb '20
Module: wine Branch: master Commit: b4c82b263ff97a6ff07bce44d615a0e00a32dcb0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b4c82b263ff97a6ff07bce44…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:41 2020 +0100 include: Make corecrt_wio.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wio.h | 92 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/include/msvcrt/corecrt_wio.h b/include/msvcrt/corecrt_wio.h index 6d4b73c915..8a4e0636a0 100644 --- a/include/msvcrt/corecrt_wio.h +++ b/include/msvcrt/corecrt_wio.h @@ -12,24 +12,76 @@ typedef __msvcrt_ulong _fsize_t; -struct _wfinddata_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - _fsize_t size; - wchar_t name[260]; +#if defined(_USE_32BIT_TIME_T) +# define _wfinddata_t _wfinddata32_t +# define _wfinddatai64_t _wfinddata32i64_t +#else +# define _wfinddata_t _wfinddata64i32_t +# define _wfinddatai64_t _wfinddata64_t +#endif + +struct _wfinddata32_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + _fsize_t size; + wchar_t name[260]; +}; + +struct _wfinddata32i64_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + wchar_t name[260]; }; -struct _wfinddatai64_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; +struct _wfinddata64i32_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + _fsize_t size; + wchar_t name[260]; }; +struct _wfinddata64_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + wchar_t name[260]; +}; + +#ifdef _UCRT +# ifdef _USE_32BIT_TIME_T +# define _wfindfirst _wfindfirst32 +# define _wfindfirsti64 _wfindfirst32i64 +# define _wfindnext _wfindnext32 +# define _wfindnexti64 _wfindnext32i64 +# else +# define _wfindfirst _wfindfirst64i32 +# define _wfindfirsti64 _wfindfirst64 +# define _wfindnext _wfindnext64i32 +# define _wfindnexti64 _wfindnext64 +# endif +#else /* _UCRT */ +# ifdef _USE_32BIT_TIME_T +# define _wfindfirst32 _wfindfirst +# define _wfindfirst32i64 _wfindfirsti64 +# define _wfindnext32 _wfindnext +# define _wfindnext32i64 _wfindnexti64 +# else +# define _wfindfirst64i32 _wfindfirst +# define _wfindfirst64 _wfindfirsti64 +# define _wfindnext64i32 _wfindnext +# define _wfindnext64 _wfindnexti64 +# endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -37,10 +89,14 @@ extern "C" { int __cdecl _waccess(const wchar_t*,int); int __cdecl _wchmod(const wchar_t*,int); int __cdecl _wcreat(const wchar_t*,int); -intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); -intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*); -int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*); +intptr_t __cdecl _wfindfirst32(const wchar_t*,struct _wfinddata32_t*); +intptr_t __cdecl _wfindfirst32i64(const wchar_t*, struct _wfinddata32i64_t*); +intptr_t __cdecl _wfindfirst64(const wchar_t*,struct _wfinddata64_t*); +intptr_t __cdecl _wfindfirst64i32(const wchar_t*, struct _wfinddata64i32_t*); +int __cdecl _wfindnext32(intptr_t,struct _wfinddata32_t*); +int __cdecl _wfindnext32i64(intptr_t,struct _wfinddata32i64_t*); +int __cdecl _wfindnext64(intptr_t,struct _wfinddata64_t*); +int __cdecl _wfindnext64i32(intptr_t,struct _wfinddata64i32_t*); wchar_t* __cdecl _wmktemp(wchar_t*); int WINAPIV _wopen(const wchar_t*,int,...); int __cdecl _wrename(const wchar_t*,const wchar_t*);
1
0
0
0
← Newer
1
...
5
6
7
8
9
10
11
...
88
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
Results per page:
10
25
50
100
200