September 2006 - Wine-Commits

Stefan Leichter : dmsynth: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: b8d3c99d4b50d78427a540c0a8e04433d128fe79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b8d3c99d4b50d78427a540c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Sep 11 22:51:14 2006 +0200 dmsynth: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmsynth/synth.c | 10 ++++++---- dlls/dmsynth/synthsink.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index b099017..ad052c2 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %lli, %p, %ld): stub\n", This, rt, pbBuffer, cbBuffer); + FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rt), pbBuffer, cbBuffer); return S_OK; } @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_Render (LPDIRECTMUSICSYNTH8 iface, short* pBuffer, DWORD dwLength, LONGLONG llPosition) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %p, %ld, %lli): stub\n", This, pBuffer, dwLength, llPosition); + FIXME("(%p, %p, %ld, 0x%s): stub\n", This, pBuffer, dwLength, wine_dbgstr_longlong(llPosition)); return S_OK; } @@ -174,13 +174,15 @@ static HRESULT WINAPI IDirectMusicSynth8 /* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %lli, %ld, %ld, %ld, %ld, %li, %li,%lli, %lli, %lli): stub\n", This, rt, dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume, stVoiceStart, stLoopStart, stLoopEnd); + FIXME("(%p, 0x%s, %ld, %ld, %ld, %ld, %li, %li,0x%s, 0x%s, 0x%s): stub\n", + This, wine_dbgstr_longlong(rt), dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume, + wine_dbgstr_longlong(stVoiceStart), wine_dbgstr_longlong(stLoopStart), wine_dbgstr_longlong(stLoopEnd)); return S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %lli, %ld): stub\n", This, rt, dwVoiceId); + FIXME("(%p, 0x%s, %ld): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId); return S_OK; } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index ed9ae71..a9f7099 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -89,13 +89,13 @@ static HRESULT WINAPI IDirectMusicSynthS static HRESULT WINAPI IDirectMusicSynthSinkImpl_SampleToRefTime (LPDIRECTMUSICSYNTHSINK iface, LONGLONG llSampleTime, REFERENCE_TIME* prfTime) { IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %lli, %p): stub\n", This, llSampleTime, prfTime); + FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(llSampleTime), prfTime); return S_OK; } static HRESULT WINAPI IDirectMusicSynthSinkImpl_RefTimeToSample (LPDIRECTMUSICSYNTHSINK iface, REFERENCE_TIME rfTime, LONGLONG* pllSampleTime) { IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; - FIXME("(%p, %lli, %p): stub\n", This, rfTime, pllSampleTime ); + FIXME("(%p, 0x%s, %p): stub\n", This, wine_dbgstr_longlong(rfTime), pllSampleTime ); return S_OK; }

1 0

Benjamin Arai : oleaut32: Conformance test for function variant:VarIdiv.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: 7e1f392a273b5a580c90cd599d5581db554f4a18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e1f392a273b5a580c90cd5… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Mon Sep 11 16:58:36 2006 -0700 oleaut32: Conformance test for function variant:VarIdiv. --- dlls/oleaut32/tests/vartest.c | 509 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 509 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7e1f392a273b5a580c9…

1 0

Benjamin Arai : oleaut32: Fixes for function variant:VarIdiv.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: ed6499918058bc274357cd9b24081f14d84f8eee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed6499918058bc274357cd9… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Mon Sep 11 16:58:23 2006 -0700 oleaut32: Fixes for function variant:VarIdiv. --- dlls/oleaut32/variant.c | 137 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 118 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2e4c795..ae27ad0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4851,33 +4851,132 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn */ HRESULT WINAPI VarIdiv(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - VARIANT lv, rv; - HRESULT hr; - + HRESULT hres = S_OK; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; + VARIANT lv,rv; + + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); + + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; + + TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), + debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + + /* Native VarIdiv always returns a error when using any extra + * flags or if the variant combination is I8 and INT. + */ + if ((leftvt == VT_I8 && rightvt == VT_INT) || + (leftvt == VT_INT && rightvt == VT_I8) || + (rightvt == VT_EMPTY && leftvt != VT_NULL) || + ExtraFlags != 0) + return DISP_E_BADVARTYPE; + + /* Determine variant type */ + else if (leftvt == VT_NULL || rightvt == VT_NULL) + { + V_VT(result) = VT_NULL; + return S_OK; + } + else if (leftvt == VT_I8 || rightvt == VT_I8) + resvt = VT_I8; + else if (leftvt == VT_I4 || rightvt == VT_I4 || + leftvt == VT_INT || rightvt == VT_INT || + leftvt == VT_UINT || rightvt == VT_UINT || + leftvt == VT_UI8 || rightvt == VT_UI8 || + leftvt == VT_UI4 || rightvt == VT_UI4 || + leftvt == VT_UI2 || rightvt == VT_UI2 || + leftvt == VT_I1 || rightvt == VT_I1 || + leftvt == VT_BSTR || rightvt == VT_BSTR || + leftvt == VT_DATE || rightvt == VT_DATE || + leftvt == VT_CY || rightvt == VT_CY || + leftvt == VT_DECIMAL || rightvt == VT_DECIMAL || + leftvt == VT_R8 || rightvt == VT_R8 || + leftvt == VT_R4 || rightvt == VT_R4) + resvt = VT_I4; + else if (leftvt == VT_I2 || rightvt == VT_I2 || + leftvt == VT_BOOL || rightvt == VT_BOOL || + leftvt == VT_EMPTY) + resvt = VT_I2; + else if (leftvt == VT_UI1 || rightvt == VT_UI1) + resvt = VT_UI1; + else + return DISP_E_BADVARTYPE; + VariantInit(&lv); VariantInit(&rv); - if ((V_VT(left) == VT_NULL) || (V_VT(right) == VT_NULL)) { - hr = VariantChangeType(result, result, 0, VT_NULL); - if (FAILED(hr)) { - /* This should never happen */ - FIXME("Failed to convert return value to VT_NULL.\n"); - return hr; - } - return S_OK; + /* coerce to the result type */ + hres = VariantChangeType(&lv, left, 0, resvt); + if (hres != S_OK) + { + VariantClear(&lv); + VariantClear(&rv); + return hres; + } + hres = VariantChangeType(&rv, right, 0, resvt); + if (hres != S_OK) + { + VariantClear(&lv); + VariantClear(&rv); + return hres; } - hr = VariantChangeType(&lv, left, 0, VT_I4); - if (FAILED(hr)) { - return hr; + /* do the math */ + V_VT(result) = resvt; + switch (resvt) + { + case VT_UI1: + if (V_UI1(&rv) == 0) + { + hres = DISP_E_DIVBYZERO; + V_VT(result) = VT_EMPTY; + } + else + V_UI1(result) = V_UI1(&lv) / V_UI1(&rv); + break; + case VT_I2: + if (V_I2(&rv) == 0) + { + hres = DISP_E_DIVBYZERO; + V_VT(result) = VT_EMPTY; + } + else + V_I2(result) = V_I2(&lv) / V_I2(&rv); + break; + case VT_I4: + if (V_I4(&rv) == 0) + { + hres = DISP_E_DIVBYZERO; + V_VT(result) = VT_EMPTY; + } + else + V_I4(result) = V_I4(&lv) / V_I4(&rv); + break; + case VT_I8: + if (V_I8(&rv) == 0) + { + hres = DISP_E_DIVBYZERO; + V_VT(result) = VT_EMPTY; } - hr = VariantChangeType(&rv, right, 0, VT_I4); - if (FAILED(hr)) { - return hr; + else + V_I8(result) = V_I8(&lv) / V_I8(&rv); + break; + default: + FIXME("Couldn't integer divide variant types %d,%d\n", + leftvt,rightvt); } - hr = VarDiv(&lv, &rv, result); - return hr; + VariantClear(&lv); + VariantClear(&rv); + + return hres; }

1 0

Benjamin Arai : oleaut32: Conformance test for function variant:VarDiv.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: a4ec2721a48508d672f2d7ca3c1b2d4d44836f4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4ec2721a48508d672f2d7c… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Mon Sep 11 11:48:31 2006 -0700 oleaut32: Conformance test for function variant:VarDiv. --- dlls/oleaut32/tests/vartest.c | 348 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 348 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a4ec2721a48508d672f…

1 0

Benjamin Arai : oleaut32: Fixes for function variant:VarDiv.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: aaca30cf039c227ef03268e10abdea3afbe239f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aaca30cf039c227ef03268e… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Mon Sep 11 11:47:48 2006 -0700 oleaut32: Fixes for function variant:VarDiv. --- dlls/oleaut32/variant.c | 155 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 110 insertions(+), 45 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 30161e0..2e4c795 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3435,65 +3435,130 @@ end: */ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - HRESULT rc = E_FAIL; - VARTYPE lvt,rvt,resvt; + HRESULT hres = S_OK; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT lv,rv; - BOOL found; + + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); + + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - VariantInit(&lv);VariantInit(&rv); - lvt = V_VT(left)&VT_TYPEMASK; - rvt = V_VT(right)&VT_TYPEMASK; - found = FALSE;resvt = VT_VOID; - if (((1<<lvt) | (1<<rvt)) & (VTBIT_R4|VTBIT_R8|VTBIT_CY)) { - found = TRUE; - resvt = VT_R8; + /* Native VarPow always returns a error when using any extra flags */ + if (ExtraFlags != 0) + return DISP_E_BADVARTYPE; + + /* Determine return type */ + if (!(rightvt == VT_EMPTY)) + { + if (leftvt == VT_NULL || rightvt == VT_NULL) + { + V_VT(result) = VT_NULL; + return S_OK; + } + else if (leftvt == VT_DECIMAL || rightvt == VT_DECIMAL) + resvt = VT_DECIMAL; + else if (leftvt == VT_I8 || rightvt == VT_I8 || + leftvt == VT_CY || rightvt == VT_CY || + leftvt == VT_DATE || rightvt == VT_DATE || + leftvt == VT_I4 || rightvt == VT_I4 || + leftvt == VT_BSTR || rightvt == VT_BSTR || + leftvt == VT_I2 || rightvt == VT_I2 || + leftvt == VT_BOOL || rightvt == VT_BOOL || + leftvt == VT_R8 || rightvt == VT_R8 || + leftvt == VT_UI1 || rightvt == VT_UI1) + { + if ((leftvt == VT_UI1 && rightvt == VT_R4) || + (leftvt == VT_R4 && rightvt == VT_UI1)) + resvt = VT_R4; + else if ((leftvt == VT_R4 && (rightvt == VT_BOOL || + rightvt == VT_I2)) || (rightvt == VT_R4 && + (leftvt == VT_BOOL || leftvt == VT_I2))) + resvt = VT_R4; + else + resvt = VT_R8; + } + else if (leftvt == VT_R4 || rightvt == VT_R4) + resvt = VT_R4; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_DECIMAL))) { - found = TRUE; - resvt = VT_DECIMAL; + else if (leftvt == VT_NULL && rightvt == VT_EMPTY) + { + V_VT(result) = VT_NULL; + return S_OK; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|VTBIT_INT|VTBIT_UINT))) { - found = TRUE; - resvt = VT_I4; + else + return DISP_E_BADVARTYPE; + + VariantInit(&lv); + VariantInit(&rv); + + /* coerce to the result type */ + hres = VariantChangeType(&lv, left, 0, resvt); + if (hres != S_OK) + { + VariantClear(&lv); + VariantClear(&rv); + return hres; } - if (!found) { - FIXME("can't expand vt %d vs %d to a target type.\n",lvt,rvt); - return E_FAIL; + + hres = VariantChangeType(&rv, right, 0, resvt); + if (hres != S_OK) + { + VariantClear(&lv); + VariantClear(&rv); + return hres; } - rc = VariantChangeType(&lv, left, 0, resvt); - if (FAILED(rc)) { - FIXME("Could not convert 0x%x to %d?\n",V_VT(left),resvt); - return rc; + + /* do the math */ + V_VT(result) = resvt; + switch (resvt) + { + case VT_R4: + if (V_R4(&lv) == 0.0 && V_R4(&rv) == 0.0) + { + hres = DISP_E_OVERFLOW; + V_VT(result) = VT_EMPTY; } - rc = VariantChangeType(&rv, right, 0, resvt); - if (FAILED(rc)) { - FIXME("Could not convert 0x%x to %d?\n",V_VT(right),resvt); - return rc; + else if (V_R4(&rv) == 0.0) + { + hres = DISP_E_DIVBYZERO; + V_VT(result) = VT_EMPTY; } - switch (resvt) { + else + V_R4(result) = V_R4(&lv) / V_R4(&rv); + break; case VT_R8: - if (V_R8(&rv) == 0) return DISP_E_DIVBYZERO; - V_VT(result) = resvt; - V_R8(result) = V_R8(&lv) / V_R8(&rv); - rc = S_OK; - break; + if (V_R8(&lv) == 0.0 && V_R8(&rv) == 0.0) + { + hres = DISP_E_OVERFLOW; + V_VT(result) = VT_EMPTY; + } + else if (V_R8(&rv) == 0.0) + { + hres = DISP_E_DIVBYZERO; + V_VT(result) = VT_EMPTY; + } + else + V_R8(result) = V_R8(&lv) / V_R8(&rv); + break; case VT_DECIMAL: - rc = VarDecDiv(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result))); - V_VT(result) = resvt; - break; - case VT_I4: - if (V_I4(&rv) == 0) return DISP_E_DIVBYZERO; - V_VT(result) = resvt; - V_I4(result) = V_I4(&lv) / V_I4(&rv); - rc = S_OK; - break; + hres = VarDecDiv(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result))); + break; } - TRACE("returning 0x%8lx (%s%s),%g\n", rc, debugstr_VT(result), - debugstr_VF(result), V_VT(result) == VT_R8 ? V_R8(result) : (double)V_I4(result)); - return rc; + + VariantClear(&lv); + VariantClear(&rv); + + return hres; } /**********************************************************************

1 0

H. Verbeet : d3d8: Free the shader handle table.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: 112810a480aaee4d6d8885637c382a99f2cf84c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=112810a480aaee4d6d88856… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Sep 11 18:51:09 2006 +0200 d3d8: Free the shader handle table. --- dlls/d3d8/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0950f72..e1bf420 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -97,6 +97,7 @@ static ULONG WINAPI IDirect3DDevice8Impl TRACE("Releasing wined3d device %p\n", This->WineD3DDevice); IWineD3DDevice_Uninit3D(This->WineD3DDevice); IWineD3DDevice_Release(This->WineD3DDevice); + HeapFree(GetProcessHeap(), 0, This->shader_handles); HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

H. Verbeet : wined3d: Cleanup the surface loading code a bit.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: 87fe835f5bb89fb527f27c9b5970b172fc30b130 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87fe835f5bb89fb527f27c9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Sep 11 18:51:18 2006 +0200 wined3d: Cleanup the surface loading code a bit. - Separate allocation and uploading of textures. - Move common code for allocating, uploading and downloading textures into separate functions. - Set the correct format and type for DXT textures. --- dlls/wined3d/surface.c | 506 +++++++++++++++++++++--------------------------- dlls/wined3d/utils.c | 10 - 2 files changed, 227 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=87fe835f5bb89fb527f…

1 0

Alexandre Julliard : ntdll: Remove the IOKit code and reuse the FreeBSD implementation for MacOS.
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: c7279864991d18078f168265cddf320354b768d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7279864991d18078f16826… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:43:37 2006 +0200 ntdll: Remove the IOKit code and reuse the FreeBSD implementation for MacOS. FILE_GetDeviceInfo needs to be efficient, and IOKit is much too slow to be used here. --- dlls/ntdll/file.c | 85 ++++------------------------------------------------- 1 files changed, 6 insertions(+), 79 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dc8a6bc..c1acdd1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -55,12 +55,6 @@ #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif -#ifdef HAVE_IOKIT_IOKITLIB_H -# include <IOKit/IOKitLib.h> -# include <CoreFoundation/CFNumber.h> /* for kCFBooleanTrue, kCFBooleanFalse */ -# include <paths.h> -#endif - #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "ntstatus.h" @@ -1629,7 +1623,7 @@ #if defined(linux) && defined(HAVE_FSTAT info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; break; } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) struct statfs stfs; /* The proper way to do this in FreeBSD seems to be with the @@ -1638,23 +1632,15 @@ #elif defined(__FreeBSD__) || defined(__ */ if (fstatfs( fd, &stfs ) < 0) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - else if (!strncmp("cd9660", stfs.f_fstypename, - sizeof(stfs.f_fstypename))) + else if (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || + !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))) { info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - /* Don't assume read-only, let the mount options set it - * below - */ + /* Don't assume read-only, let the mount options set it below */ info->Characteristics |= FILE_REMOVABLE_MEDIA; } - else if (!strncmp("nfs", stfs.f_fstypename, - sizeof(stfs.f_fstypename))) - { - info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - info->Characteristics |= FILE_REMOTE_DEVICE; - } - else if (!strncmp("nwfs", stfs.f_fstypename, - sizeof(stfs.f_fstypename))) + else if (!strncmp("nfs", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || + !strncmp("nwfs", stfs.f_fstypename, sizeof(stfs.f_fstypename))) { info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE; @@ -1671,65 +1657,6 @@ #elif defined(__FreeBSD__) || defined(__ info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE; } -#elif defined (__APPLE__) - struct statfs stfs; - kern_return_t kernResult = KERN_FAILURE; - mach_port_t masterPort; - char bsdName[6]; /* disk#\0 */ - const char *name; - - info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - - if (fstatfs( fd, &stfs ) < 0) return FILE_GetNtStatus(); - - /* stfs.f_type is reserved (always set to 0) so use IOKit */ - name = stfs.f_mntfromname + strlen(_PATH_DEV); - memcpy( bsdName, name, min(strlen(name)+1,sizeof(bsdName)) ); - bsdName[sizeof(bsdName)-1] = 0; - - kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort); - - if (kernResult == KERN_SUCCESS) - { - CFMutableDictionaryRef matching = IOBSDNameMatching(masterPort, 0, bsdName); - - if (matching) - { - CFStringRef type; - CFMutableDictionaryRef properties; - io_service_t devService = IOServiceGetMatchingService(masterPort, matching); - - if (IORegistryEntryCreateCFProperties(devService, - &properties, - kCFAllocatorDefault, 0) != KERN_SUCCESS) - return FILE_GetNtStatus(); /* FIXME */ - if ( CFEqual( - CFDictionaryGetValue(properties, CFSTR("Removable")), - kCFBooleanTrue) - ) info->Characteristics |= FILE_REMOVABLE_MEDIA; - - if ( CFEqual( - CFDictionaryGetValue(properties, CFSTR("Writable")), - kCFBooleanFalse) - ) info->Characteristics |= FILE_READ_ONLY_DEVICE; - - /* - NB : mounted disk image (.img/.dmg) don't provide specific type - */ - if ( (type = CFDictionaryGetValue(properties, CFSTR("Type"))) ) - { - if ( CFStringCompare(type, CFSTR("CD-ROM"), 0) == kCFCompareEqualTo - || CFStringCompare(type, CFSTR("DVD-ROM"), 0) == kCFCompareEqualTo - ) - { - info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - } - } - - if (properties) - CFRelease(properties); - } - } #elif defined(sun) /* Use dkio to work out device types */ {

1 0

Alexandre Julliard : wrc: Change the prefix on bison-generated names to avoid the name-prefix directive .
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: 42418fbbe89f068e2542c78163c7952d24627068 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42418fbbe89f068e2542c78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:05:20 2006 +0200 wrc: Change the prefix on bison-generated names to avoid the name-prefix directive. --- tools/wrc/newstruc.c | 44 +++++++++++------------ tools/wrc/parser.h | 10 +++-- tools/wrc/parser.l | 77 ++++++++++++++++++++-------------------- tools/wrc/parser.y | 96 ++++++++++++++++++++++++-------------------------- tools/wrc/utils.c | 8 ++-- tools/wrc/utils.h | 4 +- tools/wrc/wrc.c | 10 +++-- 7 files changed, 124 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=42418fbbe89f068e254…

1 0

Alexandre Julliard : wmc: Change the prefix on bison-generated names to avoid the name-prefix directive .
by Alexandre Julliard Sept. 12, 2006

Sept. 12, 2006

Module: wine Branch: master Commit: 4f0fa2608a4bf9ea40da9d234def91aad3806405 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f0fa2608a4bf9ea40da9d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 12 09:05:15 2006 +0200 wmc: Change the prefix on bison-generated names to avoid the name-prefix directive. --- tools/wmc/mcl.c | 18 +++++++++--------- tools/wmc/mcy.y | 8 +++----- tools/wmc/utils.c | 8 ++++---- tools/wmc/utils.h | 4 ++-- tools/wmc/wmc.c | 6 +++--- tools/wmc/wmc.h | 6 +++--- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 99abfad..62cdf25 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -302,7 +302,7 @@ #endif if(!n) { - yywarning("Re-read line (input was or converted to zilch)"); + mcy_warning("Re-read line (input was or converted to zilch)"); goto try_again; /* Should not happen, but could be due to stdin reading and a signal */ } @@ -490,7 +490,7 @@ static int scan_number(int ch) else { unget_unichar(ch); - yylval.num = 0; + mcy_lval.num = 0; return tNUMBER; } break; @@ -535,7 +535,7 @@ static int scan_number(int ch) finish: unget_unichar(ch); push_char(0); - yylval.num = strtoul(get_char_stack(), NULL, base); + mcy_lval.num = strtoul(get_char_stack(), NULL, base); return tNUMBER; } @@ -586,7 +586,7 @@ void get_tokentable(token_t **tab, int * * The scanner * */ -int yylex(void) +int mcy_lex(void) { static const WCHAR ustr_dot1[] = { '.', '\n', 0 }; static const WCHAR ustr_dot2[] = { '.', '\r', '\n', 0 }; @@ -639,7 +639,7 @@ int yylex(void) set_codepage(WMC_DEFAULT_CODEPAGE); return tMSGEND; } - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tLINE; } @@ -677,7 +677,7 @@ int yylex(void) unget_unichar(ch); push_unichar(0); want_file = 0; - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tFILE; } @@ -693,7 +693,7 @@ int yylex(void) push_unichar(0); if(!(tok = lookup_token(get_unichar_stack()))) { - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tIDENT; } switch(tok->type) @@ -706,7 +706,7 @@ int yylex(void) /* Fall through */ case tok_severity: case tok_facility: - yylval.tok = tok; + mcy_lval.tok = tok; return tTOKEN; default: @@ -738,7 +738,7 @@ int yylex(void) newline(); push_unichar(ch); /* Include the newline */ push_unichar(0); - yylval.str = xunistrdup(get_unichar_stack()); + mcy_lval.str = xunistrdup(get_unichar_stack()); return tCOMMENT; default: xyyerror("Invalid character '%c' (0x%04x)", isisochar(ch) && isprint(ch) ? ch : '.', ch); diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index abe5d02..fad56de 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -95,8 +95,6 @@ static cp_xlat_t *find_cpxlat(int lan); %} -%name-prefix="yy" - %union { WCHAR *str; unsigned num; @@ -231,7 +229,7 @@ lmap : token '=' tNUMBER setfile ':' tFI $1->codepage = $7; do_add_token(tok_language, $1, "language"); if(!find_language($3) && !find_cpxlat($3)) - yywarning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override", $3, WMC_DEFAULT_CODEPAGE); + mcy_warning("Language 0x%x not built-in, using codepage %d; use explicit codepage to override", $3, WMC_DEFAULT_CODEPAGE); } | token '=' tNUMBER setfile ':' error { xyyerror("Filename expected"); } | token '=' tNUMBER error { xyyerror(err_colon); } @@ -421,7 +419,7 @@ static void do_add_token(tok_e type, tok if(tp) { if(tok->type != type) - yywarning("Type change in token"); + mcy_warning("Type change in token"); if(tp != tok) xyyerror("Overlapping token not the same"); /* else its already defined and changed */ @@ -444,7 +442,7 @@ static lanmsg_t *new_lanmsg(lan_cp_t *lc lmp->msg = msg; lmp->len = unistrlen(msg) + 1; /* Include termination */ if(lmp->len > 4096) - yywarning("Message exceptionally long; might be a missing termination"); + mcy_warning("Message exceptionally long; might be a missing termination"); return lmp; } diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 6b2de4c..2b3b87c 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -49,7 +49,7 @@ static void generic_msg(const char *s, c * The extra routine 'xyyerror' is used to exit after giving a real * message. */ -int yyerror(const char *s, ...) +int mcy_error(const char *s, ...) { #ifndef SUPPRESS_YACC_ERROR_MESSAGE va_list ap; @@ -70,7 +70,7 @@ int xyyerror(const char *s, ...) return 1; } -int yywarning(const char *s, ...) +int mcy_warning(const char *s, ...) { va_list ap; va_start(ap, s); @@ -215,7 +215,7 @@ int unistricmp(const WCHAR *s1, const WC if(!once) { once++; - yywarning(warn); + mcy_warning(warn); } i = *s1++ - *s2++; } @@ -228,7 +228,7 @@ int unistricmp(const WCHAR *s1, const WC if((*s1 & 0xffff) > 0x7f || (*s2 & 0xffff) > 0x7f) { if(!once) - yywarning(warn); + mcy_warning(warn); return *s1 - *s2; } else diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index 361917a..5a1faf1 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -33,9 +33,9 @@ #ifndef __GNUC__ #define __attribute__(X) #endif -int yyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); +int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int xyyerror(const char *s, ...) __attribute__((format (printf, 1, 2))); -int yywarning(const char *s, ...) __attribute__((format (printf, 1, 2))); +int mcy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 4dd9889..2941219 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -113,7 +113,7 @@ int char_number = 1; /* The current cha char *cmdline; /* The entire commandline */ time_t now; /* The time of start of wmc */ -int yydebug; +int mcy_debug; int getopt (int argc, char *const *argv, const char *optstring); static void segvhandler(int sig); @@ -239,7 +239,7 @@ #endif return 1; } - yydebug = dodebug; + mcy_debug = dodebug; if(dodebug) { setbuf(stdout, 0); @@ -273,7 +273,7 @@ #endif else yyin = stdin; - ret = yyparse(); + ret = mcy_parse(); if(input_name) fclose(yyin); diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index b18c7f0..86ccd6f 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -56,15 +56,15 @@ extern time_t now; extern int line_number; extern int char_number; -int yyparse(void); -extern int yydebug; +int mcy_parse(void); +extern int mcy_debug; extern int want_nl; extern int want_line; extern int want_file; extern node_t *nodehead; extern lan_blk_t *lanblockhead; -int yylex(void); +int mcy_lex(void); FILE *yyin; void set_codepage(int cp);

1 0