January 2011 - Wine-commits

Alexandre Julliard : msvcrt: Implemented _statusfp2.
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: 4b17ec7405334d15a70539edd9a219c423614cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b17ec7405334d15a70539edd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 21:39:29 2011 +0100 msvcrt: Implemented _statusfp2. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 67 ++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 58 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2569325..1a5577b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1128,7 +1128,7 @@ @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @ cdecl _statusfp() msvcrt._statusfp -@ stub _statusfp2 +@ cdecl -arch=i386 _statusfp2(ptr ptr) msvcrt._statusfp2 @ stub _strcoll_l @ cdecl _strdate(ptr) msvcrt._strdate @ cdecl _strdate_s(ptr long) msvcrt._strdate_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6a0bcf6..014bdb5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -982,7 +982,7 @@ @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @ cdecl _statusfp() msvcrt._statusfp -@ stub _statusfp2 +@ cdecl -arch=i386 _statusfp2(ptr ptr) msvcrt._statusfp2 @ stub _strcoll_l @ cdecl _strdate(ptr) msvcrt._strdate @ cdecl _strdate_s(ptr long) msvcrt._strdate_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7d17a24..b06159b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -968,7 +968,7 @@ @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) @ cdecl _statusfp() msvcrt._statusfp -@ stub _statusfp2 +@ cdecl -arch=i386 _statusfp2(ptr ptr) msvcrt._statusfp2 @ stub _strcoll_l @ cdecl _strdate(ptr) msvcrt._strdate @ cdecl _strdate_s(ptr long) msvcrt._strdate_s diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index cb49756..988ccc7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -768,25 +768,66 @@ void CDECL MSVCRT___setusermatherr(MSVCRT_matherr_func func) } /********************************************************************** + * _statusfp2 (MSVCRT.@) + * + * Not exported by native msvcrt, added in msvcr80. + */ +#if defined(__i386__) || defined(__x86_64__) +void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) +{ +#ifdef __GNUC__ + unsigned int flags; + unsigned long fpword; + + if (x86_sw) + { + __asm__ __volatile__( "fstsw %0" : "=m" (fpword) ); + flags = 0; + if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; + if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; + if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; + if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; + if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; + if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + *x86_sw = flags; + } + + if (!sse2_sw) return; + + if (sse2_supported) + { + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + flags = 0; + if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; + if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; + if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; + if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; + if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; + if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + *sse2_sw = flags; + } + else *sse2_sw = 0; +#else + FIXME( "not implemented\n" ); +#endif +} +#endif + +/********************************************************************** * _statusfp (MSVCRT.@) */ unsigned int CDECL _statusfp(void) { - unsigned int retVal = 0; -#if defined(__GNUC__) && defined(__i386__) - unsigned int fpword; - - __asm__ __volatile__( "fstsw %0" : "=m" (fpword) : ); - if (fpword & 0x1) retVal |= MSVCRT__SW_INVALID; - if (fpword & 0x2) retVal |= MSVCRT__SW_DENORMAL; - if (fpword & 0x4) retVal |= MSVCRT__SW_ZERODIVIDE; - if (fpword & 0x8) retVal |= MSVCRT__SW_OVERFLOW; - if (fpword & 0x10) retVal |= MSVCRT__SW_UNDERFLOW; - if (fpword & 0x20) retVal |= MSVCRT__SW_INEXACT; +#if defined(__i386__) || defined(__x86_64__) + unsigned int x86_sw, sse2_sw; + + _statusfp2( &x86_sw, &sse2_sw ); + /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ + return x86_sw | sse2_sw; #else - FIXME(":Not implemented!\n"); + FIXME( "not implemented\n" ); + return 0; #endif - return retVal; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ebf988d..02f7b89 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1485,5 +1485,6 @@ @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_purecall_handler(ptr) +@ cdecl -arch=i386 _statusfp2(ptr ptr) @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl _wdupenv_s(ptr ptr str)

1 0

Alexandre Julliard : msvcrt: Implemented _clearfp for SSE2 and x86_64.
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: 98d7a021d62b4ad3d880f35888f8ae7b7f7b26b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d7a021d62b4ad3d880f3588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 21:59:45 2011 +0100 msvcrt: Implemented _clearfp for SSE2 and x86_64. --- dlls/msvcrt/math.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 988ccc7..6755fbb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -835,13 +835,34 @@ unsigned int CDECL _statusfp(void) */ unsigned int CDECL _clearfp(void) { - unsigned int retVal = _statusfp(); -#if defined(__GNUC__) && defined(__i386__) - __asm__ __volatile__( "fnclex" ); + unsigned int flags = 0; +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + unsigned long fpword; + + __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; + if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; + if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; + if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; + if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; + if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + + if (sse2_supported) + { + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; + if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; + if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; + if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; + if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; + if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + fpword &= ~0x3f; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + } #else - FIXME(":Not Implemented\n"); + FIXME( "not implemented\n" ); #endif - return retVal; + return flags; } /*********************************************************************

1 0

Alexandre Julliard : msvcrt: Implemented _fpreset for SSE2 and x86_64.
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: c74f6ca570ba1f5209888f0d1ed92b0ed29f0a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74f6ca570ba1f5209888f0d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 22:12:16 2011 +0100 msvcrt: Implemented _fpreset for SSE2 and x86_64. --- dlls/msvcrt/math.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6755fbb..306ad1d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1111,10 +1111,16 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if defined(__GNUC__) && defined(__i386__) - __asm__ __volatile__( "fninit" ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + const unsigned int x86_cw = 0x27f; + __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); + if (sse2_supported) + { + const unsigned long sse2_cw = 0x1f80; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (sse2_cw) ); + } #else - FIXME(":Not Implemented!\n"); + FIXME( "not implemented\n" ); #endif }

1 0

Alexandre Julliard : msvcrt: Implemented _set_controlfp.
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: 658eaeb3e0f94e300e5274aec9e1d99ae6691b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=658eaeb3e0f94e300e5274aec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 22:27:17 2011 +0100 msvcrt: Implemented _set_controlfp. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1a5577b..1c720dc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1069,7 +1069,7 @@ @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior -@ stub _set_controlfp +@ cdecl _set_controlfp(long long) msvcrt._set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 014bdb5..f4bde1a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -922,7 +922,7 @@ @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_amblksiz -@ stub _set_controlfp +@ cdecl _set_controlfp(long long) msvcrt._set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b06159b..01ebec7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -908,7 +908,7 @@ @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @ cdecl _set_abort_behavior(long long) msvcrt._set_abort_behavior @ stub _set_amblksiz -@ stub _set_controlfp +@ cdecl _set_controlfp(long long) msvcrt._set_controlfp @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 306ad1d..eac3f08 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1068,6 +1068,14 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) } /********************************************************************* + * _set_controlfp (MSVCRT.@) + */ +void CDECL _set_controlfp( unsigned int newval, unsigned int mask ) +{ + _controlfp( newval, mask ); +} + +/********************************************************************* * _controlfp_s (MSVCRT.@) */ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 02f7b89..50a0b21 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -851,7 +851,7 @@ # stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -# stub _set_controlfp +@ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) @ cdecl _set_errno(long) @ cdecl _set_error_mode(long)

1 0

Stefan Reimer : winemp3: Fixed exit condition within decoding loop.
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: e8a2452c052f5ae9cc79db10a451d7209070aeb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a2452c052f5ae9cc79db10a… Author: Stefan Reimer <it(a)stefanreimer.de> Date: Tue Jan 25 00:44:18 2011 -0800 winemp3: Fixed exit condition within decoding loop. --- dlls/winemp3.acm/mpegl3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 2ee8430..548483a 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -192,7 +192,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); } dpos += size; - if (dpos > *ndst) break; + if (dpos >= *ndst) break; } while (ret != MPG123_ERR && ret != MPG123_NEED_MORE); *ndst = dpos; }

1 0

Henri Verbeet : d3d10: Remove a redundant assignment in parse_fx10_object() (LLVM/Clang).
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: 73637fcbc65a0d7f069ba3443c15488b1225cc00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73637fcbc65a0d7f069ba3443… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 19:26:23 2011 +0100 d3d10: Remove a redundant assignment in parse_fx10_object() (LLVM/Clang). --- dlls/d3d10/effect.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index af7f811..a51d6c3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -915,7 +915,6 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr { case D3D10_EOO_VALUE: TRACE("Copy variable values\n"); - hr = E_FAIL; switch (o->type) {

1 0

Henri Verbeet : d3d9: Remove some useless ERRs (LLVM/Clang).
by Alexandre Julliard 26 Jan '11

26 Jan '11

Module: wine Branch: master Commit: 5c7c31fc874635364b36bdc7fbcf4cdc2328d101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7c31fc874635364b36bdc7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 25 19:26:24 2011 +0100 d3d9: Remove some useless ERRs (LLVM/Clang). --- dlls/d3d9/surface.c | 4 ---- dlls/d3d9/volume.c | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 6601530..4ec6104 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -232,10 +232,6 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac if (!This->container) return E_NOINTERFACE; - if (!ppContainer) { - ERR("Called without a valid ppContainer\n"); - } - res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 5206187..643238a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -169,10 +169,6 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, if (!This->container) return E_NOINTERFACE; - if (!ppContainer) { - ERR("Called without a valid ppContainer.\n"); - } - res = IUnknown_QueryInterface(This->container, riid, ppContainer); TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.5 and 1.3.12
by Jeremy Newman 26 Jan '11

26 Jan '11

Module: website Branch: master Commit: 98560847670a89e1d6d65d127d2f38e34917f2c0 URL: http://source.winehq.org/git/website.git/?a=commit;h=98560847670a89e1d6d65d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Jan 24 19:03:04 2011 +0100 Polish translation for release 1.3.5 and 1.3.12 --- news/pl/2010101501.xml | 19 +++++++++++++++++++ news/pl/2011012101.xml | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/news/pl/2010101501.xml b/news/pl/2010101501.xml new file mode 100644 index 0000000..09dbf85 --- /dev/null +++ b/news/pl/2010101501.xml @@ -0,0 +1,19 @@ +<news> +<date>Październik 15, 2010</date> +<title>Wydano Wine 1.3.5</title> +<body> + Wydanie rozwojowe Wine 1.3.5 jest już dostępne. + <a href="{$root}/announce/1.3.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla animowanych kursorów.</li> + <li>Drukowanie bezpośrednio przez CUPS zamiast lpr.</li> + <li>Poprawki dla instalatora Office 2010.</li> + <li>Wiele ulepszeń MSXML3.</li> + <li>Ulepszone wsparcie dla Shader Model 4.</li> + <li>Nadanie właściwych ikon we wbudowanym Internet Explorer.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2011012101.xml b/news/pl/2011012101.xml new file mode 100644 index 0000000..ea8750c --- /dev/null +++ b/news/pl/2011012101.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 21, 2011</date> +<title>Wydano Wine 1.3.12</title> +<body> + Wydanie rozwojowe Wine 1.3.12 jest już dostępne. + <a href="{$root}/announce/1.3.12">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla różnych rozmiarów ikon w winemenubuilder.</li> + <li>Ulepszenia w przeglądarce pomocy.</li> + <li>Wstępna integracja spróbuj z DOSBox.</li> + <li>Rozmaite poprawki w MSI.</li> + <li>Kilka poprawek do debugera Wine.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.12.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Loïc Maury : ntdll : Implement CDROM_Verify to work on Mac OS X.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 1b767a5948d36f35405da8329978695d5d7ac733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b767a5948d36f35405da8329… Author: Loïc Maury <lmaury(a)gmail.com> Date: Tue Jan 25 13:25:27 2011 +0100 ntdll : Implement CDROM_Verify to work on Mac OS X. --- dlls/ntdll/cdrom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 59f85a0..6a6d8e0 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1121,6 +1121,10 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; +#elif defined(__APPLE__) + /* At this point, we know that we have media, because in Mac OS X, the + * device file is only created when media is present. */ + return STATUS_SUCCESS; #else FIXME("not supported on this O/S\n"); return STATUS_NOT_SUPPORTED;

1 0

Detlef Riekenberg : msvcr90: Implement _stat32, _fstat32, _wstat32.
by Alexandre Julliard 25 Jan '11

25 Jan '11

Module: wine Branch: master Commit: 6e610f1e1a6c42877e12af98d476d5e22aaa78f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e610f1e1a6c42877e12af98d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 23 17:46:30 2011 +0100 msvcr90: Implement _stat32, _fstat32, _wstat32. --- dlls/msvcr100/msvcr100.spec | 6 ++-- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 6 ++-- include/msvcrt/sys/stat.h | 17 ++++++++++++ include/msvcrt/wchar.h | 15 ++++++++++ 6 files changed, 101 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c103916..b4a0f7b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -651,7 +651,7 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ stub _fstat32 +@ cdecl _fstat32(long ptr) msvcr90._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @@ -1123,7 +1123,7 @@ @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l -@ stub _stat32 +@ cdecl _stat32(str ptr) msvcr90._stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @@ -1393,7 +1393,7 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s -@ stub _wstat32 +@ cdecl _wstat32(wstr ptr) msvcr90._wstat32 @ stub _wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 @ cdecl _wstat64i32(wstr ptr) msvcr90._wstat64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4879e13..814edf2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -492,7 +492,7 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ stub _fstat32 +@ cdecl _fstat32(long ptr) msvcr90._fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @@ -977,7 +977,7 @@ @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l -@ stub _stat32 +@ cdecl _stat32(str ptr) msvcr90._stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @@ -1249,7 +1249,7 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s -@ stub _wstat32 +@ cdecl _wstat32(wstr ptr) msvcr90._wstat32 @ stub _wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 @ cdecl _wstat64i32(wstr ptr) msvcr90._wstat64i32 diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 523ceec..34ee20f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -31,6 +31,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); /********************************************************************* + * msvcr90_stat64_to_stat32 [internal] + */ +static void msvcr90_stat64_to_stat32(const struct _stat64 *buf64, struct _stat32 *buf) +{ + buf->st_dev = buf64->st_dev; + buf->st_ino = buf64->st_ino; + buf->st_mode = buf64->st_mode; + buf->st_nlink = buf64->st_nlink; + buf->st_uid = buf64->st_uid; + buf->st_gid = buf64->st_gid; + buf->st_rdev = buf64->st_rdev; + buf->st_size = buf64->st_size; + buf->st_atime = buf64->st_atime; + buf->st_mtime = buf64->st_mtime; + buf->st_ctime = buf64->st_ctime; +} + +/********************************************************************* * DllMain (MSVCR90.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) @@ -136,6 +154,48 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) } /********************************************************************* + * _fstat32 (MSVCR90.@) + */ +int CDECL _fstat32(int fd, struct _stat32* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _fstat64(fd, &buf64); + if (!ret) + msvcr90_stat64_to_stat32(&buf64, buf); + return ret; +} + +/********************************************************************* + * _stat32 (MSVCR90.@) + */ +int CDECL _stat32(const char *path, struct _stat32* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _stat64(path, &buf64); + if (!ret) + msvcr90_stat64_to_stat32(&buf64, buf); + return ret; +} + +/********************************************************************* + * _wstat32 (MSVCR90.@) + */ +int CDECL _wstat32(const wchar_t *path, struct _stat32* buf) +{ + int ret; + struct _stat64 buf64; + + ret = _wstat64(path, &buf64); + if (!ret) + msvcr90_stat64_to_stat32(&buf64, buf); + return ret; +} + +/********************************************************************* * _fstat64i32 (MSVCRT.@) */ diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index aa0f981..e39ef87 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -484,7 +484,7 @@ @ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen -@ stub _fstat32 +@ cdecl _fstat32(long ptr) @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstat64i32(long ptr) @@ -963,7 +963,7 @@ @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l -@ stub _stat32 +@ cdecl _stat32(str ptr) @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) @@ -1233,7 +1233,7 @@ @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s -@ stub _wstat32 +@ cdecl _wstat32(wstr ptr) @ stub _wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 @ cdecl _wstat64i32(wstr ptr) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 9362d2d..6509e04 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -83,6 +83,20 @@ struct stat { time_t st_ctime; }; +struct _stat32 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + __time32_t st_atime; + __time32_t st_mtime; + __time32_t st_ctime; +}; + struct _stat32i64 { _dev_t st_dev; _ino_t st_ino; @@ -146,6 +160,8 @@ extern "C" { int __cdecl _fstat(int,struct _stat*); int __cdecl _stat(const char*,struct _stat*); +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 _fstat64(int,struct _stat64*); @@ -155,6 +171,7 @@ int __cdecl _umask(int); #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED 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 _wstat64(const wchar_t*,struct _stat64*); #endif /* _WSTAT_DEFINED */ diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index f7656b2..21f2b3f 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -148,6 +148,20 @@ struct stat { time_t st_ctime; }; +struct _stat32 { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + _off_t st_size; + __time32_t st_atime; + __time32_t st_mtime; + __time32_t st_ctime; +}; + struct _stati64 { _dev_t st_dev; _ino_t st_ino; @@ -264,6 +278,7 @@ int __cdecl _wsystem(const wchar_t*); #ifndef _WSTAT_DEFINED #define _WSTAT_DEFINED 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 _wstat64(const wchar_t*,struct _stat64*); #endif /* _WSTAT_DEFINED */

1 0